Changeset 1469 for ThirdParty/ASL/branches

Timestamp:

Feb 6, 2010 3:12:35 PM (11 years ago)

Author:

stefan

Message:

add prefix coin to .pc files; changed install dir for libs and doc

Location:

ThirdParty/ASL/branches/BSPsplit

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (5 diffs)
• coinasl-uninstalled.pc.in (moved) (moved from ThirdParty/ASL/branches/BSPsplit/asl-uninstalled.pc.in)
• coinasl.pc.in (moved) (moved from ThirdParty/ASL/branches/BSPsplit/asl.pc.in) (1 diff)
• configure (modified) (3 diffs)
• configure.ac (modified) (2 diffs)

ThirdParty/ASL/branches/BSPsplit/Makefile.am

@@ -35 +35 @@
 stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
 
-thirdpartylibdir = $(prefix)/lib/ThirdParty
+thirdpartylibdir = $(libdir)/coin/ThirdParty
 install-exec-local: $(libampl)
         test -z "$(DESTDIR)$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
@@ -43 +43 @@
         rm -f $(DESTDIR)$(thirdpartylibdir)/$(libampl)
 
-addlibsdir = $(prefix)/share/doc/coin/ThirdParty/ASL
+addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL
 addlibs_DATA = README asl_addlibs.txt
 
@@ -52 +52 @@
   stdio1.h arith.h
 
-pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
-pkgconfiglib_DATA = asl.pc
+pkgconfiglibdir = $(libdir)/pkgconfig
+pkgconfiglib_DATA = coinasl.pc
 
 CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)

ThirdParty/ASL/branches/BSPsplit/Makefile.in

@@ -57 +57 @@
         $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
         $(srcdir)/../../missing $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in $(srcdir)/asl-uninstalled.pc.in \
-        $(srcdir)/asl.pc.in $(srcdir)/asl_addlibs.txt.in \
+        $(srcdir)/Makefile.in $(srcdir)/asl_addlibs.txt.in \
+        $(srcdir)/coinasl-uninstalled.pc.in $(srcdir)/coinasl.pc.in \
         $(srcdir)/compile_MS_ASL.in $(srcdir)/compile_Unix_ASL.in \
         $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
@@ -73 +73 @@
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = asl_addlibs.txt compile_MS_ASL compile_Unix_ASL \
-        asl.pc asl-uninstalled.pc
+        coinasl.pc coinasl-uninstalled.pc
 SOURCES =
 DIST_SOURCES =
@@ -250 +250 @@
 #else
 alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
-thirdpartylibdir = $(prefix)/lib/ThirdParty
-addlibsdir = $(prefix)/share/doc/coin/ThirdParty/ASL
+thirdpartylibdir = $(libdir)/coin/ThirdParty
+addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL
 addlibs_DATA = README asl_addlibs.txt
 thirdpartyincludedir = $(includedir)/coin/ThirdParty
@@ -259 +259 @@
   stdio1.h arith.h
 
-pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
-pkgconfiglib_DATA = asl.pc
+pkgconfiglibdir = $(libdir)/pkgconfig
+pkgconfiglib_DATA = coinasl.pc
 CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
 
@@ -313 +313 @@
 compile_Unix_ASL: $(top_builddir)/config.status $(srcdir)/compile_Unix_ASL.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
-asl.pc: $(top_builddir)/config.status $(srcdir)/asl.pc.in
+coinasl.pc: $(top_builddir)/config.status $(srcdir)/coinasl.pc.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
-asl-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/asl-uninstalled.pc.in
+coinasl-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinasl-uninstalled.pc.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
 

ThirdParty/ASL/branches/BSPsplit/coinasl.pc.in

@@ -1 +1 @@
 prefix=@prefix@
-libdir=@exec_prefix@/lib/ThirdParty
-includedir=${prefix}/include/coin/ThirdParty
+exec_prefix=@exec_prefix@
+libdir=@libdir@/coin/ThirdParty
+includedir=@includedir@/coin/ThirdParty
 
 Name: ASL

ThirdParty/ASL/branches/BSPsplit/configure

@@ -19840 +19840 @@
 # Set substitutable variables with the absolute path to the library name
 # translate to windows style if necessary, but use slashes instead of backslashes
-ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${prefix}/lib/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
+ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${libdir}/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
 curdir=`pwd`
 ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
@@ -20072 +20072 @@
           ac_config_files="$ac_config_files compile_Unix_ASL"
 
-                    ac_config_files="$ac_config_files asl.pc asl-uninstalled.pc"
+                    ac_config_files="$ac_config_files coinasl.pc coinasl-uninstalled.pc"
 
 
@@ -20756 +20756 @@
   "compile_MS_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_MS_ASL" ;;
   "compile_Unix_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_Unix_ASL" ;;
-  "asl.pc" ) CONFIG_FILES="$CONFIG_FILES asl.pc" ;;
-  "asl-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES asl-uninstalled.pc" ;;
+  "coinasl.pc" ) CONFIG_FILES="$CONFIG_FILES coinasl.pc" ;;
+  "coinasl-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES coinasl-uninstalled.pc" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

ThirdParty/ASL/branches/BSPsplit/configure.ac

@@ -81 +81 @@
 # Set substitutable variables with the absolute path to the library name
 # translate to windows style if necessary, but use slashes instead of backslashes
-ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${prefix}/lib/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
+ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${libdir}/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
 curdir=`pwd`
 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])
 AC_CONFIG_FILES([compile_Unix_ASL],[chmod a+x compile_Unix_ASL])
-AC_CONFIG_FILES([asl.pc asl-uninstalled.pc])
+AC_CONFIG_FILES([coinasl.pc coinasl-uninstalled.pc])
 
 AC_COIN_FINALIZE