diff -Naur insight-6.8.orig/itcl/itcl/Makefile.in insight-6.8.new/itcl/itcl/Makefile.in
--- insight-6.8.orig/itcl/itcl/Makefile.in 2005-09-01 07:32:08.000000000 +0200
+++ insight-6.8.new/itcl/itcl/Makefile.in 2008-08-15 14:50:06.000000000 +0200
@@ -149,8 +149,6 @@
includedir = @includedir@
oldincludedir = /usr/include
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
pkglibdir = $(libdir)/@PACKAGE@@VERSION@
pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
@@ -276,12 +274,12 @@
@echo "Installing header files in $(includedir)"
@for i in $(GENERIC_HDRS) ; do \
echo "Installing $$i" ; \
- $(INSTALL_DATA) $$i $(includedir) ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
done;
@echo "Installing library files in $(ITCL_LIBRARY)"
@for i in $(srcdir)/library/*.tcl ; do \
echo "Installing $$i" ; \
- $(INSTALL_DATA) $$i $(ITCL_LIBRARY) ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(ITCL_LIBRARY) ; \
done;
#========================================================================
@@ -290,14 +288,14 @@
#========================================================================
install-doc: doc
- $(mkinstalldirs) $(mandir)/mann
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/mann
@echo "Installing man pages in $(mandir)"
@cd $(srcdir)/doc; for i in *.n; \
do \
echo "Installing $$i"; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- $$i > $(mandir)/mann/$$i; \
- chmod 444 $(mandir)/mann/$$i; \
+ $$i > $(DESTDIR)$(mandir)/mann/$$i; \
+ chmod 444 $(DESTDIR)$(mandir)/mann/$$i; \
done
test: $(TCLSH_PROG)
@@ -447,7 +445,7 @@
$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
- $(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
#========================================================================
# Install binary executables (e.g. .exe files)
@@ -485,7 +483,7 @@
$(mkinstalldirs) $(DESTDIR)$(libdir)
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- $(mkinstalldirs) $(ITCL_LIBRARY)
+ $(mkinstalldirs) $(DESTDIR)$(ITCL_LIBRARY)
.PHONY: all binaries clean depend distclean doc install installdirs \
libraries test
diff -Naur insight-6.8.orig/itcl/itk/Makefile.in insight-6.8.new/itcl/itk/Makefile.in
--- insight-6.8.orig/itcl/itk/Makefile.in 2005-09-01 07:32:09.000000000 +0200
+++ insight-6.8.new/itcl/itk/Makefile.in 2008-08-15 14:55:41.000000000 +0200
@@ -137,8 +137,6 @@
includedir = @includedir@
oldincludedir = /usr/include
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
pkglibdir = $(libdir)/@PACKAGE@@VERSION@
pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
@@ -267,16 +265,16 @@
#========================================================================
install-libraries: libraries
- $(mkinstalldirs) $(includedir)
+ $(mkinstalldirs) $(DESTDIR)$(includedir)
@echo "Installing header files in $(includedir)"
@for i in $(GENERIC_HDRS) ; do \
echo "Installing $$i" ; \
- $(INSTALL_DATA) $$i $(includedir) ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
done;
@echo "Installing library files in $(ITK_LIBRARY)"
@for i in $(srcdir)/library/*.* $(srcdir)/library/tclIndex ; do \
echo "Installing $$i" ; \
- $(INSTALL_DATA) $$i $(ITK_LIBRARY) ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(ITK_LIBRARY) ; \
done;
#========================================================================
@@ -285,14 +283,14 @@
#========================================================================
install-doc: doc
- $(mkinstalldirs) $(mandir)/mann
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/mann
@echo "Installing man pages in $(mandir)"
@cd $(srcdir)/doc; for i in *.n; \
do \
echo "Installing $$i info $(mandir)/mann"; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- $$i > $(mandir)/mann/$$i; \
- chmod 444 $(mandir)/mann/$$i; \
+ $$i > $(DESTDIR)$(mandir)/mann/$$i; \
+ chmod 444 $(DESTDIR)$(mandir)/mann/$$i; \
done
test: $(TCLSH_PROG)
@@ -421,7 +419,7 @@
$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
- $(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
#========================================================================
# Install binary executables (e.g. .exe files)
@@ -459,7 +457,7 @@
$(mkinstalldirs) $(DESTDIR)$(libdir)
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- $(mkinstalldirs) $(ITK_LIBRARY)
+ $(mkinstalldirs) $(DESTDIR)$(ITK_LIBRARY)
.PHONY: all binaries clean depend distclean doc install installdirs \
libraries test
diff -Naur insight-6.8.orig/itcl/iwidgets/Makefile.in insight-6.8.new/itcl/iwidgets/Makefile.in
--- insight-6.8.orig/itcl/iwidgets/Makefile.in 2003-02-25 01:42:12.000000000 +0100
+++ insight-6.8.new/itcl/iwidgets/Makefile.in 2008-08-15 15:04:17.000000000 +0200
@@ -36,13 +36,13 @@
# to be different than those used for actually reference files at
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files.
-INSTALL_ROOT =
+INSTALL_ROOT = $(DESTDIR)
# Path name to use when installing library scripts:
# REDHAT LOCAL
#SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/iwidgets$(IWIDGETS_VERSION)
-SCRIPT_INSTALL_DIR = @datadir@/iwidgets$(IWIDGETS_VERSION)
+SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)@datadir@/iwidgets$(IWIDGETS_VERSION)
# END REDHAT LOCAL
# Directory in which to install the archive libtcl.a:
diff -Naur insight-6.8.orig/tcl/unix/Makefile.in insight-6.8.new/tcl/unix/Makefile.in
--- insight-6.8.orig/tcl/unix/Makefile.in 2003-01-21 20:40:18.000000000 +0100
+++ insight-6.8.new/tcl/unix/Makefile.in 2008-08-15 12:12:33.000000000 +0200
@@ -38,7 +38,7 @@
# to be different than those used for actually reference files at
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files.
-INSTALL_ROOT =
+INSTALL_ROOT = $(DESTDIR)
# Path for the platform independent Tcl scripting libraries:
# REDHAT LOCAL
diff -Naur insight-6.8.orig/tk/unix/Makefile.in insight-6.8.new/tk/unix/Makefile.in
--- insight-6.8.orig/tk/unix/Makefile.in 2003-01-21 21:24:51.000000000 +0100
+++ insight-6.8.new/tk/unix/Makefile.in 2008-08-15 15:08:00.000000000 +0200
@@ -41,7 +41,7 @@
# to be different than those used for actually reference files at
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files.
-INSTALL_ROOT =
+INSTALL_ROOT = $(DESTDIR)
# Directory from which applications will reference the library of Tcl
# scripts (note: you can set the TK_LIBRARY environment variable at