Changeset 1486


Ignore:
Timestamp:
Jul 22, 2010 6:04:38 AM (9 years ago)
Author:
stefan
Message:

create xxx_addlibs.txt after installation by using only .pc files of installed projects; rerun autotools

Location:
trunk/Cbc
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.am

    r1471 r1486  
    117117########################################################################
    118118
    119 if COIN_HAS_PKGCONFIG
    120 addlibsdir = $(datadir)/coin/doc/Cbc
    121 addlibs_DATA = cbc_addlibs.txt
    122 
    123 cbc_addlibs.txt : cbc.pc
    124         PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs cbc > cbc_addlibs.txt
    125 endif
    126 
    127119pkgconfiglibdir = $(libdir)/pkgconfig
    128120pkgconfiglib_DATA = cbc.pc osi-cbc.pc
     121
     122if COIN_HAS_PKGCONFIG
     123addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc
     124       
     125install-data-hook:
     126        @$(mkdir_p) "$(addlibsdir)"
     127        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     128        $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
     129endif
    129130
    130131########################################################################
  • trunk/Cbc/Makefile.in

    r1484 r1486  
    9494  esac;
    9595am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    96 am__installdirs = "$(DESTDIR)$(addlibsdir)" \
    97         "$(DESTDIR)$(pkgconfiglibdir)"
    98 addlibsDATA_INSTALL = $(INSTALL_DATA)
     96am__installdirs = "$(DESTDIR)$(pkgconfiglibdir)"
    9997pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    100 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
     98DATA = $(pkgconfiglib_DATA)
    10199ETAGS = etags
    102100CTAGS = ctags
     
    179177COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
    180178COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     179COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    181180CPP = @CPP@
    182181CPPFLAGS = @CPPFLAGS@
     
    393392#                  Installation of the addlibs file                    #
    394393########################################################################
    395 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/Cbc
    396 @COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = cbc_addlibs.txt
    397394pkgconfiglibdir = $(libdir)/pkgconfig
    398395pkgconfiglib_DATA = cbc.pc osi-cbc.pc
     396@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc
    399397
    400398########################################################################
     
    480478        -rm -f libtool
    481479uninstall-info-am:
    482 install-addlibsDATA: $(addlibs_DATA)
    483         @$(NORMAL_INSTALL)
    484         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    485         @list='$(addlibs_DATA)'; for p in $$list; do \
    486           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    487           f=$(am__strip_dir) \
    488           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    489           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    490         done
    491 
    492 uninstall-addlibsDATA:
    493         @$(NORMAL_UNINSTALL)
    494         @list='$(addlibs_DATA)'; for p in $$list; do \
    495           f=$(am__strip_dir) \
    496           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    497           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    498         done
    499480install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
    500481        @$(NORMAL_INSTALL)
     
    794775installdirs: installdirs-recursive
    795776installdirs-am:
    796         for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
     777        for dir in "$(DESTDIR)$(pkgconfiglibdir)"; do \
    797778          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    798779        done
     
    823804        @echo "This command is intended for maintainers to use"
    824805        @echo "it deletes files that may require special tools to rebuild."
     806@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    825807clean: clean-recursive
    826808
     
    843825info-am:
    844826
    845 install-data-am: install-addlibsDATA install-pkgconfiglibDATA
     827install-data-am: install-pkgconfiglibDATA
     828        @$(NORMAL_INSTALL)
     829        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    846830
    847831install-exec-am: install-exec-local
     
    871855ps-am:
    872856
    873 uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
     857uninstall-am: uninstall-info-am uninstall-local \
    874858        uninstall-pkgconfiglibDATA
    875859
     
    883867        distclean-local distclean-recursive distclean-tags \
    884868        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    885         html-am info info-am install install-addlibsDATA install-am \
    886         install-data install-data-am install-exec install-exec-am \
     869        html-am info info-am install install-am install-data \
     870        install-data-am install-data-hook install-exec install-exec-am \
    887871        install-exec-local install-info install-info-am install-man \
    888872        install-pkgconfiglibDATA install-strip installcheck \
     
    891875        mostlyclean mostlyclean-generic mostlyclean-libtool \
    892876        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
    893         uninstall uninstall-addlibsDATA uninstall-am uninstall-info-am \
    894         uninstall-local uninstall-pkgconfiglibDATA
     877        uninstall uninstall-am uninstall-info-am uninstall-local \
     878        uninstall-pkgconfiglibDATA
    895879
    896880
     
    916900.PHONY: test unitTest
    917901
    918 @COIN_HAS_PKGCONFIG_TRUE@cbc_addlibs.txt : cbc.pc
    919 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs cbc > cbc_addlibs.txt
     902@COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
     903@COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
     904@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     905@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    920906
    921907install-doc: $(DocFiles)
  • trunk/Cbc/configure

    r1485 r1486  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CBC_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA REQUIREDPACKAGES COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CBC_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA REQUIREDPACKAGES COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2067220672
    2067320673
    20674 # assemble search path for pkg-config
     20674# assemble pkg-config search path for installed projects
    2067520675COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2067620676
     
    2069520695fi;
    2069620696
     20697
     20698
     20699# assemble additional pkg-config search paths for uninstalled projects
    2069720700if test x$coin_projectdir = xyes ; then
    2069820701  # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
     
    2070020703  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
    2070120704  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
     20705  COIN_PKG_CONFIG_PATH_UNINSTALLED=
    2070220706  if test -e ../coin_subdirs.txt ; then
    2070320707    for i in `cat ../coin_subdirs.txt` ; do
    2070420708      if test -d ../$i ; then
    20705         COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     20709        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2070620710      fi
    2070720711    done
     
    2071120715    for i in `cat ../../coin_subdirs.txt` ; do
    2071220716      if test -d ../../$i ; then
    20713         COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     20717        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2071420718      fi
    2071520719    done
    2071620720  fi
    2071720721
    20718 fi
    20719 
     20722
     20723fi
    2072020724
    2072120725
     
    2077820782    # need to export variable to be sure that the following pkg-config gets these values
    2077920783    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    20780     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     20784    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2078120785    export PKG_CONFIG_PATH
    2078220786
     
    2082320827    # reset PKG_CONFIG_PATH variable
    2082420828    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     20829    export PKG_CONFIG_PATH
    2082520830  else
    2082620831    #if 4th argument is given, try fallback - whereby we take the first word from coinutils = trunk osi cgl as basename for the .pc file
     
    2133621341    # need to export variable to be sure that the following pkg-config gets these values
    2133721342    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    21338     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     21343    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2133921344    export PKG_CONFIG_PATH
    2134021345
     
    2138121386    # reset PKG_CONFIG_PATH variable
    2138221387    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21388    export PKG_CONFIG_PATH
    2138321389  else
    2138421390    #if 4th argument is given, try fallback - whereby we take the first word from osi-clp as basename for the .pc file
     
    2164521651    # need to export variable to be sure that the following pkg-config gets these values
    2164621652    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    21647     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     21653    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2164821654    export PKG_CONFIG_PATH
    2164921655
     
    2169021696    # reset PKG_CONFIG_PATH variable
    2169121697    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21698    export PKG_CONFIG_PATH
    2169221699  else
    2169321700    #if 4th argument is given, try fallback - whereby we take the first word from osi-dylp as basename for the .pc file
     
    2179721804    # need to export variable to be sure that the following pkg-config gets these values
    2179821805    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    21799     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     21806    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2180021807    export PKG_CONFIG_PATH
    2180121808
     
    2184221849    # reset PKG_CONFIG_PATH variable
    2184321850    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21851    export PKG_CONFIG_PATH
    2184421852  else
    2184521853    #if 4th argument is given, try fallback - whereby we take the first word from osi-vol as basename for the .pc file
     
    2194921957    # need to export variable to be sure that the following pkg-config gets these values
    2195021958    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    21951     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     21959    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2195221960    export PKG_CONFIG_PATH
    2195321961
     
    2199422002    # reset PKG_CONFIG_PATH variable
    2199522003    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     22004    export PKG_CONFIG_PATH
    2199622005  else
    2199722006    #if 4th argument is given, try fallback - whereby we take the first word from osi-unittests as basename for the .pc file
     
    2217722186    # need to export variable to be sure that the following pkg-config gets these values
    2217822187    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    22179     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     22188    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2218022189    export PKG_CONFIG_PATH
    2218122190
     
    2222222231    # reset PKG_CONFIG_PATH variable
    2222322232    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     22233    export PKG_CONFIG_PATH
    2222422234  else
    2222522235    #if 4th argument is given, try fallback - whereby we take the first word from coindatasample as basename for the .pc file
     
    2240422414    # need to export variable to be sure that the following pkg-config gets these values
    2240522415    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    22406     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     22416    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2240722417    export PKG_CONFIG_PATH
    2240822418
     
    2244922459    # reset PKG_CONFIG_PATH variable
    2245022460    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     22461    export PKG_CONFIG_PATH
    2245122462  else
    2245222463    #if 4th argument is given, try fallback - whereby we take the first word from coindatanetlib as basename for the .pc file
     
    2263122642    # need to export variable to be sure that the following pkg-config gets these values
    2263222643    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    22633     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     22644    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2263422645    export PKG_CONFIG_PATH
    2263522646
     
    2267622687    # reset PKG_CONFIG_PATH variable
    2267722688    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     22689    export PKG_CONFIG_PATH
    2267822690  else
    2267922691    #if 4th argument is given, try fallback - whereby we take the first word from coindatamiplib3 as basename for the .pc file
     
    2286422876    # need to export variable to be sure that the following pkg-config gets these values
    2286522877    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    22866     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     22878    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2286722879    export PKG_CONFIG_PATH
    2286822880
     
    2290922921    # reset PKG_CONFIG_PATH variable
    2291022922    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     22923    export PKG_CONFIG_PATH
    2291122924  else
    2291222925    #if 4th argument is given, try fallback - whereby we take the first word from osi-cplex as basename for the .pc file
     
    2301623029    # need to export variable to be sure that the following pkg-config gets these values
    2301723030    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    23018     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     23031    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2301923032    export PKG_CONFIG_PATH
    2302023033
     
    2306123074    # reset PKG_CONFIG_PATH variable
    2306223075    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     23076    export PKG_CONFIG_PATH
    2306323077  else
    2306423078    #if 4th argument is given, try fallback - whereby we take the first word from osi-glpk as basename for the .pc file
     
    2316823182    # need to export variable to be sure that the following pkg-config gets these values
    2316923183    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    23170     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     23184    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2317123185    export PKG_CONFIG_PATH
    2317223186
     
    2321323227    # reset PKG_CONFIG_PATH variable
    2321423228    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     23229    export PKG_CONFIG_PATH
    2321523230  else
    2321623231    #if 4th argument is given, try fallback - whereby we take the first word from osi-gurobi as basename for the .pc file
     
    2332023335    # need to export variable to be sure that the following pkg-config gets these values
    2332123336    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    23322     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     23337    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2332323338    export PKG_CONFIG_PATH
    2332423339
     
    2336523380    # reset PKG_CONFIG_PATH variable
    2336623381    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     23382    export PKG_CONFIG_PATH
    2336723383  else
    2336823384    #if 4th argument is given, try fallback - whereby we take the first word from osi-mosek as basename for the .pc file
     
    2347223488    # need to export variable to be sure that the following pkg-config gets these values
    2347323489    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    23474     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     23490    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2347523491    export PKG_CONFIG_PATH
    2347623492
     
    2351723533    # reset PKG_CONFIG_PATH variable
    2351823534    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     23535    export PKG_CONFIG_PATH
    2351923536  else
    2352023537    #if 4th argument is given, try fallback - whereby we take the first word from osi-soplex as basename for the .pc file
     
    2362423641    # need to export variable to be sure that the following pkg-config gets these values
    2362523642    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    23626     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     23643    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2362723644    export PKG_CONFIG_PATH
    2362823645
     
    2366923686    # reset PKG_CONFIG_PATH variable
    2367023687    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     23688    export PKG_CONFIG_PATH
    2367123689  else
    2367223690    #if 4th argument is given, try fallback - whereby we take the first word from osi-xpress as basename for the .pc file
     
    2378223800    # need to export variable to be sure that the following pkg-config gets these values
    2378323801    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    23784     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     23802    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
    2378523803    export PKG_CONFIG_PATH
    2378623804
     
    2382723845    # reset PKG_CONFIG_PATH variable
    2382823846    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     23847    export PKG_CONFIG_PATH
    2382923848  else
    2383023849    #if 4th argument is given, try fallback - whereby we take the first word from coinasl as basename for the .pc file
     
    2556625585s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
    2556725586s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
     25587s,@COIN_PKG_CONFIG_PATH_UNINSTALLED@,$COIN_PKG_CONFIG_PATH_UNINSTALLED,;t t
    2556825588s,@COINDEPEND_LIBS@,$COINDEPEND_LIBS,;t t
    2556925589s,@COINDEPEND_CFLAGS@,$COINDEPEND_CFLAGS,;t t
  • trunk/Cbc/src/Makefile.in

    r1484 r1486  
    301301COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
    302302COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     303COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    303304CPP = @CPP@
    304305CPPFLAGS = @CPPFLAGS@
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1484 r1486  
    169169COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
    170170COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     171COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    171172CPP = @CPP@
    172173CPPFLAGS = @CPPFLAGS@
  • trunk/Cbc/test/Makefile.in

    r1484 r1486  
    189189COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
    190190COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     191COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    191192CPP = @CPP@
    192193CPPFLAGS = @CPPFLAGS@
Note: See TracChangeset for help on using the changeset viewer.