Changeset 16626


Ignore:
Timestamp:
2008-07-31T15:47:05+12:00 (13 years ago)
Author:
davidb
Message:

Conflict markup left in by accident. Now removed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r16625 r16626  
    13631363  </target>
    13641364 
    1365 <<<<<<< .mine
    1366   <target name="rename-gs2build-files-windows" if="collection.building.enabled.windows">
    1367     <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
    1368     <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/common-src/src/lib/win32.mak"/>
    1369     <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/>
    1370     <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/>
    1371   </target>
    1372  
    1373   <target name="rename-gs2build-files-unix" if="collection.building.enabled.unix">
    1374     <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
    1375     <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/>   
    1376     <chmod file="${gs2build.home}/configure" perm="a+x"/>
    1377     <copy file="${gs2build-extra.home}/configure.in" tofile="${gs2build.home}/configure.in"/>
    1378     <copy file="${gs2build-extra.home}/Makefile.in" tofile="${gs2build.home}/Makefile.in"/> 
    1379     <copy file="${gs2build-extra.home}/packages.configure" tofile="${gs2build.home}/packages/configure"/>
    1380     <chmod file="${gs2build.home}/packages/configure" perm="a+x"/>
    1381     <copy file="${gs2build-extra.home}/packages.Makefile.in" tofile="${gs2build.home}/packages/Makefile.in"/>
    1382     <copy file="${gs2build-extra.home}/lib.Makefile.in" tofile="${gs2build.home}/src/lib/Makefile.in"/> 
    1383   </target>
    1384  
    1385 =======
    1386 >>>>>>> .r16624
    13871365  <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present">
    13881366    <antcall target="checkout-gli"/>
Note: See TracChangeset for help on using the changeset viewer.