Changeset 16626 for greenstone3/trunk/build.xml

Timestamp:

2008-07-31T15:47:05+12:00 (16 years ago)

Author:

davidb

Message:

Conflict markup left in by accident. Now removed

File:

• greenstone3/trunk/build.xml (modified) (1 diff)

greenstone3/trunk/build.xml

@@ -1363 +1363 @@
   </target>
   
-<<<<<<< .mine
-  <target name="rename-gs2build-files-windows" if="collection.building.enabled.windows">
-    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
-    <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/common-src/src/lib/win32.mak"/>
-    <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/>
-    <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/>
-  </target> 
-  
-  <target name="rename-gs2build-files-unix" if="collection.building.enabled.unix">
-    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
-    <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/>    
-    <chmod file="${gs2build.home}/configure" perm="a+x"/>
-    <copy file="${gs2build-extra.home}/configure.in" tofile="${gs2build.home}/configure.in"/>
-    <copy file="${gs2build-extra.home}/Makefile.in" tofile="${gs2build.home}/Makefile.in"/>  
-    <copy file="${gs2build-extra.home}/packages.configure" tofile="${gs2build.home}/packages/configure"/>
-    <chmod file="${gs2build.home}/packages/configure" perm="a+x"/>
-    <copy file="${gs2build-extra.home}/packages.Makefile.in" tofile="${gs2build.home}/packages/Makefile.in"/>
-    <copy file="${gs2build-extra.home}/lib.Makefile.in" tofile="${gs2build.home}/src/lib/Makefile.in"/>  
-  </target>
-  
-=======
->>>>>>> .r16624
   <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present">
     <antcall target="checkout-gli"/>