Changeset 1469 for ThirdParty/Glpk/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/Glpk/branches/BSPsplit

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• coinglpk-uninstalled.pc.in (moved) (moved from ThirdParty/Glpk/branches/BSPsplit/glpk-uninstalled.pc.in)
• coinglpk.pc.in (moved) (moved from ThirdParty/Glpk/branches/BSPsplit/glpk.pc.in) (1 diff)
• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)

ThirdParty/Glpk/branches/BSPsplit/Makefile.am

@@ -9 +9 @@
 EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch
 
-thirdpartylibdir = $(prefix)/lib/ThirdParty
+thirdpartylibdir = $(libdir)/coin/ThirdParty
 thirdpartylib_LTLIBRARIES = libcoinglpk.la
 
@@ -170 +170 @@
 thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
 
-addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
+addlibsdir = $(datadir)/coin/doc/ThirdParty/Glpk
 addlibs_DATA = glpk_addlibs.txt README
 
-pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
-pkgconfiglib_DATA = glpk.pc
+pkgconfiglibdir = $(libdir)/pkgconfig
+pkgconfiglib_DATA = coinglpk.pc
 
 ########################################################################

ThirdParty/Glpk/branches/BSPsplit/Makefile.in

@@ -59 +59 @@
         $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
         $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-        $(srcdir)/config_glpk.h.in $(srcdir)/glpk-uninstalled.pc.in \
-        $(srcdir)/glpk.pc.in $(srcdir)/glpk_addlibs.txt.in \
+        $(srcdir)/coinglpk-uninstalled.pc.in $(srcdir)/coinglpk.pc.in \
+        $(srcdir)/config_glpk.h.in $(srcdir)/glpk_addlibs.txt.in \
         $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
@@ -74 +74 @@
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config_glpk.h
-CONFIG_CLEAN_FILES = glpk_addlibs.txt glpk.pc glpk-uninstalled.pc
+CONFIG_CLEAN_FILES = glpk_addlibs.txt coinglpk.pc \
+        coinglpk-uninstalled.pc
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -275 +276 @@
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch $(am__append_1)
-thirdpartylibdir = $(prefix)/lib/ThirdParty
+thirdpartylibdir = $(libdir)/coin/ThirdParty
 thirdpartylib_LTLIBRARIES = libcoinglpk.la
 libcoinglpk_la_SOURCES = \
@@ -410 +411 @@
 thirdpartyincludedir = $(includedir)/coin/ThirdParty
 thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
-addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
+addlibsdir = $(datadir)/coin/doc/ThirdParty/Glpk
 addlibs_DATA = glpk_addlibs.txt README
-pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
-pkgconfiglib_DATA = glpk.pc
+pkgconfiglibdir = $(libdir)/pkgconfig
+pkgconfiglib_DATA = coinglpk.pc
 
 ########################################################################
@@ -480 +481 @@
 glpk_addlibs.txt: $(top_builddir)/config.status $(srcdir)/glpk_addlibs.txt.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
-glpk.pc: $(top_builddir)/config.status $(srcdir)/glpk.pc.in
+coinglpk.pc: $(top_builddir)/config.status $(srcdir)/coinglpk.pc.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
-glpk-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/glpk-uninstalled.pc.in
+coinglpk-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinglpk-uninstalled.pc.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)

ThirdParty/Glpk/branches/BSPsplit/coinglpk.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: Glpk

ThirdParty/Glpk/branches/BSPsplit/configure

@@ -21893 +21893 @@
 
 
-                                        ac_config_files="$ac_config_files Makefile glpk_addlibs.txt glpk.pc glpk-uninstalled.pc"
+                                        ac_config_files="$ac_config_files Makefile glpk_addlibs.txt coinglpk.pc coinglpk-uninstalled.pc"
 
           ac_config_headers="$ac_config_headers config_glpk.h"
@@ -22551 +22551 @@
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "glpk_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES glpk_addlibs.txt" ;;
-  "glpk.pc" ) CONFIG_FILES="$CONFIG_FILES glpk.pc" ;;
-  "glpk-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES glpk-uninstalled.pc" ;;
+  "coinglpk.pc" ) CONFIG_FILES="$CONFIG_FILES coinglpk.pc" ;;
+  "coinglpk-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES coinglpk-uninstalled.pc" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config_glpk.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config_glpk.h" ;;

ThirdParty/Glpk/branches/BSPsplit/configure.ac

@@ -245 +245 @@
 AC_SUBST(GLPKDIR)
 
-AC_CONFIG_FILES([Makefile glpk_addlibs.txt glpk.pc glpk-uninstalled.pc])
+AC_CONFIG_FILES([Makefile glpk_addlibs.txt coinglpk.pc coinglpk-uninstalled.pc])
 AC_CONFIG_HEADER([config_glpk.h])