Changeset 16519 for release-kits/mark2/ant-scripts/compile.xml

Timestamp:

2008-07-24T09:15:13+12:00 (16 years ago)

Author:

oranfry

Message:

now mark2 does different things for intel and ppc macs

File:

• release-kits/mark2/ant-scripts/compile.xml (modified) (2 diffs)

release-kits/mark2/ant-scripts/compile.xml

@@ -34 +34 @@
         <if><bool><istrue value="${execute}"/></bool>
             <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
-                <arg line="--with-gdbm=${mark2.home}/mac/gdbm-1.8.3"/>
+                <arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/>
             </exec>
         </if>
@@ -41 +41 @@
     <target name="tweak-makefiles">
         <if><bool><istrue value="${execute}"/></bool>
-    <rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/gdbm-1.8.3/lib/libgdbm.a$2" />
-    <rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/gdbm-1.8.3/lib/libgdbm.a$2" />
-    <rsr file="${basedir}/gsdl/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/gdbm-1.8.3/lib/libgdbm.a$2" />
-    <rsr file="${basedir}/gsdl/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/gdbm-1.8.3/lib/libgdbm.a$2" />
+    <rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+    <rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+    <rsr file="${basedir}/gsdl/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+    <rsr file="${basedir}/gsdl/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
     <rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
     <rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />