From 00cbe5790f2082b42294d66827bf3e8eda62e657 Mon Sep 17 00:00:00 2001 From: saintel Date: Mon, 15 Sep 2008 06:39:21 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 4 ++++ src/Makefile.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a42b3fd1..593b116a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-09-15 Lionel Sainte Cluque + * src/Makefile.am: Add $(DESTDIR) in tclspice installation, required by + debian package. + 2008-09-13 Holger Vogt * configure.in: add AC_LIBTOOL_WIN32_DLL * src/makefile.am correct typo diff --git a/src/Makefile.am b/src/Makefile.am index e9d0df67b..8afc48ba2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -281,7 +281,7 @@ TCL_FILES = libspice.la pkgIndex.tcl pkgIndex.tcl: pkgIndex.tcl.in rm -f $@ - sed -e 's;%LIB_DIR%;$(libdir);g' $< | \ + sed -e 's;%LIB_DIR%;$(DESTDIR)$(libdir);g' $< | \ sed -e 's;%VERSION%;$(TCLSPICE_VERSION);g' > $@ all: $(TCL_FILES) @@ -294,8 +294,8 @@ install-tcl-recursive: done; install-tclspice: - $(mkinstalldirs) $(libdir)/spice - $(INSTALL_DATA) pkgIndex.tcl $(libdir)/spice + $(mkinstalldirs) $(DESTDIR)$(libdir)/spice + $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir)/spice tclspice.lo: tclspice.c $(LTCOMPILE) -DTCLSPICE_version="\"$(TCLSPICE_VERSION)\"" -MT tclspice.lo -MD -MP -MF $(DEPDIR)/tclspice.Tpo -c -o tclspice.o $<