Changeset 1169 for stable/1.6


Ignore:
Timestamp:
Feb 22, 2008 12:30:09 PM (14 years ago)
Author:
tkr
Message:

Merging r1155 r1156 r1162 from trunk to stable

Location:
stable/1.6/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • stable/1.6/Clp/Makefile.am

    r1145 r1169  
    9696
    9797addlibsfile = clp_addlibs.txt
     98addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
    9899
    99100install-exec-local: install-doc
    100         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
     101        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    101102
    102103uninstall-local: uninstall-doc
    103         rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
     104        rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    104105
    105106########################################################################

  • stable/1.6/Clp/Makefile.in

    r1157 r1169  
    277277########################################################################
    278278addlibsfile = clp_addlibs.txt
     279addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
    279280
    280281########################################################################
    … …  
    746747
    747748install-exec-local: install-doc
    748         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
     749        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    749750
    750751uninstall-local: uninstall-doc
    751         rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
     752        rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    752753
    753754install-doc: $(DocFiles)

  • stable/1.6/Clp/examples/Makefile.in

    r1145 r1169  
    6161# Libraries necessary to link with Clp
    6262LIBS = -L$(COINLIBDIR) -lClp -lCoinUtils \
    63         @ADDLIBS@ `cat $(COINLIBDIR)/coinutils_addlibs.txt`
     63        @ADDLIBS@ `cat @COINUTILSDOCDIR@/coinutils_addlibs.txt`
    6464
    6565# Necessary Include dirs (we use the CYGPATH_W variables to allow
Note: See TracChangeset for help on using the changeset viewer.