Changeset 1469 for ThirdParty/ASL/branches
- Timestamp:
- Feb 6, 2010 3:12:35 PM (11 years ago)
- Location:
- ThirdParty/ASL/branches/BSPsplit
- Files:
-
- 4 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
ThirdParty/ASL/branches/BSPsplit/Makefile.am
r1454 r1469 35 35 stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl) 36 36 37 thirdpartylibdir = $( prefix)/lib/ThirdParty37 thirdpartylibdir = $(libdir)/coin/ThirdParty 38 38 install-exec-local: $(libampl) 39 39 test -z "$(DESTDIR)$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)" … … 43 43 rm -f $(DESTDIR)$(thirdpartylibdir)/$(libampl) 44 44 45 addlibsdir = $( prefix)/share/doc/coin/ThirdParty/ASL45 addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL 46 46 addlibs_DATA = README asl_addlibs.txt 47 47 … … 52 52 stdio1.h arith.h 53 53 54 pkgconfiglibdir = $( prefix)/lib/ThirdParty/pkgconfig55 pkgconfiglib_DATA = asl.pc54 pkgconfiglibdir = $(libdir)/pkgconfig 55 pkgconfiglib_DATA = coinasl.pc 56 56 57 57 CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT) -
ThirdParty/ASL/branches/BSPsplit/Makefile.in
r1461 r1469 57 57 $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \ 58 58 $(srcdir)/../../missing $(srcdir)/Makefile.am \ 59 $(srcdir)/Makefile.in $(srcdir)/asl -uninstalled.pc.in \60 $(srcdir)/ asl.pc.in $(srcdir)/asl_addlibs.txt.in \59 $(srcdir)/Makefile.in $(srcdir)/asl_addlibs.txt.in \ 60 $(srcdir)/coinasl-uninstalled.pc.in $(srcdir)/coinasl.pc.in \ 61 61 $(srcdir)/compile_MS_ASL.in $(srcdir)/compile_Unix_ASL.in \ 62 62 $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure … … 73 73 mkinstalldirs = $(install_sh) -d 74 74 CONFIG_CLEAN_FILES = asl_addlibs.txt compile_MS_ASL compile_Unix_ASL \ 75 asl.pcasl-uninstalled.pc75 coinasl.pc coinasl-uninstalled.pc 76 76 SOURCES = 77 77 DIST_SOURCES = … … 250 250 #else 251 251 alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT) 252 thirdpartylibdir = $( prefix)/lib/ThirdParty253 addlibsdir = $( prefix)/share/doc/coin/ThirdParty/ASL252 thirdpartylibdir = $(libdir)/coin/ThirdParty 253 addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL 254 254 addlibs_DATA = README asl_addlibs.txt 255 255 thirdpartyincludedir = $(includedir)/coin/ThirdParty … … 259 259 stdio1.h arith.h 260 260 261 pkgconfiglibdir = $( prefix)/lib/ThirdParty/pkgconfig262 pkgconfiglib_DATA = asl.pc261 pkgconfiglibdir = $(libdir)/pkgconfig 262 pkgconfiglib_DATA = coinasl.pc 263 263 CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT) 264 264 … … 313 313 compile_Unix_ASL: $(top_builddir)/config.status $(srcdir)/compile_Unix_ASL.in 314 314 cd $(top_builddir) && $(SHELL) ./config.status $@ 315 asl.pc: $(top_builddir)/config.status $(srcdir)/asl.pc.in315 coinasl.pc: $(top_builddir)/config.status $(srcdir)/coinasl.pc.in 316 316 cd $(top_builddir) && $(SHELL) ./config.status $@ 317 asl-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/asl-uninstalled.pc.in317 coinasl-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinasl-uninstalled.pc.in 318 318 cd $(top_builddir) && $(SHELL) ./config.status $@ 319 319 -
ThirdParty/ASL/branches/BSPsplit/coinasl.pc.in
r1463 r1469 1 1 prefix=@prefix@ 2 libdir=@exec_prefix@/lib/ThirdParty 3 includedir=${prefix}/include/coin/ThirdParty 2 exec_prefix=@exec_prefix@ 3 libdir=@libdir@/coin/ThirdParty 4 includedir=@includedir@/coin/ThirdParty 4 5 5 6 Name: ASL -
ThirdParty/ASL/branches/BSPsplit/configure
r1461 r1469 19840 19840 # Set substitutable variables with the absolute path to the library name 19841 19841 # translate to windows style if necessary, but use slashes instead of backslashes 19842 ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${ prefix}/lib/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`19842 ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${libdir}/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'` 19843 19843 curdir=`pwd` 19844 19844 ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'` … … 20072 20072 ac_config_files="$ac_config_files compile_Unix_ASL" 20073 20073 20074 ac_config_files="$ac_config_files asl.pcasl-uninstalled.pc"20074 ac_config_files="$ac_config_files coinasl.pc coinasl-uninstalled.pc" 20075 20075 20076 20076 … … 20756 20756 "compile_MS_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_MS_ASL" ;; 20757 20757 "compile_Unix_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_Unix_ASL" ;; 20758 " asl.pc" ) CONFIG_FILES="$CONFIG_FILESasl.pc" ;;20759 " asl-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILESasl-uninstalled.pc" ;;20758 "coinasl.pc" ) CONFIG_FILES="$CONFIG_FILES coinasl.pc" ;; 20759 "coinasl-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES coinasl-uninstalled.pc" ;; 20760 20760 "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; 20761 20761 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -
ThirdParty/ASL/branches/BSPsplit/configure.ac
r1461 r1469 81 81 # Set substitutable variables with the absolute path to the library name 82 82 # translate to windows style if necessary, but use slashes instead of backslashes 83 ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${ prefix}/lib/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`83 ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${libdir}/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'` 84 84 curdir=`pwd` 85 85 ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'` … … 185 185 AC_CONFIG_FILES([compile_MS_ASL],[chmod a+x compile_MS_ASL]) 186 186 AC_CONFIG_FILES([compile_Unix_ASL],[chmod a+x compile_Unix_ASL]) 187 AC_CONFIG_FILES([ asl.pcasl-uninstalled.pc])187 AC_CONFIG_FILES([coinasl.pc coinasl-uninstalled.pc]) 188 188 189 189 AC_COIN_FINALIZE
Note: See TracChangeset
for help on using the changeset viewer.