Changeset 23611
- Timestamp:
- 2011-01-19T14:08:42+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r23599 r23611 223 223 <!-- If building a release then we want to adjust environment variables so that the support library can be see during compilation --> 224 224 <if><bool><isset property="use.support.lib"/></bool> 225 226 225 <property name="gnome-lib-dir" value="${basedir}/ext/gnome-lib-minimal/${os.bin.dir}"/> 227 226 … … 268 267 </if> 269 268 270 <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool> 271 <property name="ldlpath.arg" value="LD_LIBRARY_PATH="${gnome-lib-dir}/lib:${env.LD_LIBRARY_PATH}""/> 269 <if><bool><equals arg1="${os.bin.dir}" arg2="darwin"/></bool> 270 <if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool> 271 <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH="${gnome-lib-dir}/lib:${env.DYLD_LIBRARY_PATH}""/> 272 <else> 273 <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH="${gnome-lib-dir}/lib""/> 274 </else> 275 </if> 272 276 <else> 273 <property name="ldlpath.arg" value="LD_LIBRARY_PATH="${gnome-lib-dir}/lib""/> 277 <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool> 278 <property name="ldlpath.arg" value="LD_LIBRARY_PATH="${gnome-lib-dir}/lib:${env.LD_LIBRARY_PATH}""/> 279 <else> 280 <property name="ldlpath.arg" value="LD_LIBRARY_PATH="${gnome-lib-dir}/lib""/> 281 </else> 282 </if> 274 283 </else> 275 284 </if> … … 318 327 </if> 319 328 320 <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool> 321 <property name="ldlpath.arg" value="LD_LIBRARY_PATH="${env.LD_LIBRARY_PATH}""/> 329 <if><bool><equals arg1="${os.bin.dir}" arg2="darwin"/></bool> 330 <if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool> 331 <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH="${env.DYLD_LIBRARY_PATH}""/> 332 <else> 333 <property name="ldlpath.arg" value=" "/> 334 </else> 335 </if> 322 336 <else> 323 <property name="ldlpath.arg" value=" "/> 324 </else> 337 <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool> 338 <property name="ldlpath.arg" value="LD_LIBRARY_PATH="${env.LD_LIBRARY_PATH}""/> 339 <else> 340 <property name="ldlpath.arg" value=" "/> 341 </else> 342 </if> 343 </else> 325 344 </if> 326 345 </else> 327 346 </if> 347 <property name="allargs" value="${cflags.arg} ${cxxflags.arg} ${cppflags.arg} ${ldflags.arg} ${path.arg} ${ldlpath.arg} ${pcpath.arg}"/> 348 <echo>ALL ARGS = ${allargs}</echo> 328 349 329 350 <condition property="gs2.opt.args" value= " " else="--disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite"> … … 1524 1545 <arg line="${gs2.opt.args}"/> 1525 1546 <arg line="${static.arg}"/> 1526 <arg line="${ldflags.arg}"/> 1527 <arg line="${cflags.arg}"/> 1528 <arg line="${cppflags.arg}"/> 1529 <arg line="${cxxflags.arg}"/> 1530 <arg line="${path.arg}"/> 1531 <arg line="${pcpath.arg}"/> 1532 <arg line="${ldlpath.arg}"/> 1547 <arg line="${allargs}"/> 1533 1548 </exec> 1534 1549 </target> … … 1844 1859 <target name="configure-build-src" depends="init" if="collection.building.enabled" 1845 1860 description="Configure the build-src component"> 1861 <echo>ALL ARGS - BUILD-SRC = ${allargs}</echo> 1846 1862 <exec executable="${build.src.home}/configure" os="${os.unix}" 1847 1863 dir="${build.src.home}" failonerror="true"> 1848 1864 <arg value="--prefix=${gs2build.home}"/> 1849 <arg line="${gs2.opt.args}"/> 1850 <arg line="${static.arg}"/> 1851 <arg line="${ldflags.arg}"/> 1852 <arg line="${cflags.arg}"/> 1853 <arg line="${cppflags.arg}"/> 1854 <arg line="${cxxflags.arg}"/> 1855 <arg line="${path.arg}"/> 1856 <arg line="${pcpath.arg}"/> 1857 <arg line="${ldlpath.arg}"/> 1865 <arg line="${gs2.opt.args} ${static.arg} ${allargs}"/> 1858 1866 </exec> 1859 1867 </target> … … 1863 1871 1864 1872 <exec executable="make" dir="${build.src.home}" os="${os.unix}" failonerror="true"> 1873 <arg line="${ldlpath.arg}"/> 1865 1874 </exec> 1866 1875
Note:
See TracChangeset
for help on using the changeset viewer.