Changeset 1469 for ThirdParty/ASL


Ignore:
Timestamp:
Feb 6, 2010 3:12:35 PM (10 years ago)
Author:
stefan
Message:

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

Location:
ThirdParty/ASL/branches/BSPsplit
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/branches/BSPsplit/Makefile.am

    r1454 r1469  
    3535stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
    3636
    37 thirdpartylibdir = $(prefix)/lib/ThirdParty
     37thirdpartylibdir = $(libdir)/coin/ThirdParty
    3838install-exec-local: $(libampl)
    3939        test -z "$(DESTDIR)$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
     
    4343        rm -f $(DESTDIR)$(thirdpartylibdir)/$(libampl)
    4444
    45 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/ASL
     45addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL
    4646addlibs_DATA = README asl_addlibs.txt
    4747
     
    5252  stdio1.h arith.h
    5353
    54 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    55 pkgconfiglib_DATA = asl.pc
     54pkgconfiglibdir = $(libdir)/pkgconfig
     55pkgconfiglib_DATA = coinasl.pc
    5656
    5757CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
  • ThirdParty/ASL/branches/BSPsplit/Makefile.in

    r1461 r1469  
    5757        $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
    5858        $(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 \
    6161        $(srcdir)/compile_MS_ASL.in $(srcdir)/compile_Unix_ASL.in \
    6262        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
     
    7373mkinstalldirs = $(install_sh) -d
    7474CONFIG_CLEAN_FILES = asl_addlibs.txt compile_MS_ASL compile_Unix_ASL \
    75         asl.pc asl-uninstalled.pc
     75        coinasl.pc coinasl-uninstalled.pc
    7676SOURCES =
    7777DIST_SOURCES =
     
    250250#else
    251251alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    252 thirdpartylibdir = $(prefix)/lib/ThirdParty
    253 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/ASL
     252thirdpartylibdir = $(libdir)/coin/ThirdParty
     253addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL
    254254addlibs_DATA = README asl_addlibs.txt
    255255thirdpartyincludedir = $(includedir)/coin/ThirdParty
     
    259259  stdio1.h arith.h
    260260
    261 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    262 pkgconfiglib_DATA = asl.pc
     261pkgconfiglibdir = $(libdir)/pkgconfig
     262pkgconfiglib_DATA = coinasl.pc
    263263CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    264264
     
    313313compile_Unix_ASL: $(top_builddir)/config.status $(srcdir)/compile_Unix_ASL.in
    314314        cd $(top_builddir) && $(SHELL) ./config.status $@
    315 asl.pc: $(top_builddir)/config.status $(srcdir)/asl.pc.in
     315coinasl.pc: $(top_builddir)/config.status $(srcdir)/coinasl.pc.in
    316316        cd $(top_builddir) && $(SHELL) ./config.status $@
    317 asl-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/asl-uninstalled.pc.in
     317coinasl-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinasl-uninstalled.pc.in
    318318        cd $(top_builddir) && $(SHELL) ./config.status $@
    319319
  • ThirdParty/ASL/branches/BSPsplit/coinasl.pc.in

    r1463 r1469  
    11prefix=@prefix@
    2 libdir=@exec_prefix@/lib/ThirdParty
    3 includedir=${prefix}/include/coin/ThirdParty
     2exec_prefix=@exec_prefix@
     3libdir=@libdir@/coin/ThirdParty
     4includedir=@includedir@/coin/ThirdParty
    45
    56Name: ASL
  • ThirdParty/ASL/branches/BSPsplit/configure

    r1461 r1469  
    1984019840# Set substitutable variables with the absolute path to the library name
    1984119841# 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'`
     19842ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${libdir}/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    1984319843curdir=`pwd`
    1984419844ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
     
    2007220072          ac_config_files="$ac_config_files compile_Unix_ASL"
    2007320073
    20074                     ac_config_files="$ac_config_files asl.pc asl-uninstalled.pc"
     20074                    ac_config_files="$ac_config_files coinasl.pc coinasl-uninstalled.pc"
    2007520075
    2007620076
     
    2075620756  "compile_MS_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_MS_ASL" ;;
    2075720757  "compile_Unix_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_Unix_ASL" ;;
    20758   "asl.pc" ) CONFIG_FILES="$CONFIG_FILES asl.pc" ;;
    20759   "asl-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES asl-uninstalled.pc" ;;
     20758  "coinasl.pc" ) CONFIG_FILES="$CONFIG_FILES coinasl.pc" ;;
     20759  "coinasl-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES coinasl-uninstalled.pc" ;;
    2076020760  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2076120761  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  • ThirdParty/ASL/branches/BSPsplit/configure.ac

    r1461 r1469  
    8181# Set substitutable variables with the absolute path to the library name
    8282# 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'`
     83ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${libdir}/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    8484curdir=`pwd`
    8585ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
     
    185185AC_CONFIG_FILES([compile_MS_ASL],[chmod a+x compile_MS_ASL])
    186186AC_CONFIG_FILES([compile_Unix_ASL],[chmod a+x compile_Unix_ASL])
    187 AC_CONFIG_FILES([asl.pc asl-uninstalled.pc])
     187AC_CONFIG_FILES([coinasl.pc coinasl-uninstalled.pc])
    188188
    189189AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.