This is the mail archive of the insight@sourceware.org mailing list for the Insight project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

get DESTDIR working

From: Mike Frysinger <vapier at gentoo dot org>
To: insight at sourceware dot org
Date: Wed, 7 Mar 2007 21:13:20 -0500
Subject: get DESTDIR working

i'm not entirely sure who to e-mail to get tcl/tk/itcl/etc... fixes integrated 
into the sourceware repo, but since i wrote this patch for insight, i'll 
start here ;)

the attached patch is what i needed in order to get `make install DESTDR=/foo` 
working ... in some places, the $(DESTDIR) support was incomplete while in 
others, i simply set the default INSTALL_ROOT variable to $(DESTDIR) as this 
should cause no regressions at all (if you set INSTALL_ROOT, it'll still be 
respected)
-mike

Attachment: pgp00000.pgp
Description: PGP signature

2007-03-07  Mike Frysinger  <vapier@gentoo.org>

	* itcl/Makefile.in (install-libraries): Respect $(DESTDIR).
	(install-doc): Likewise.
	(install-lib-binaries): Likewise.
	(installdirs): Likewise.
	* itk/Makefile.in (install-libraries): Respect $(DESTDIR).
	(install-doc): Likewise.
	(install-lib-binaries): Likewise.
	(installdirs): Likewise.
	* iwidgets/Makefile.in (INSTALL_ROOT): Default to $(DESTDIR).

--- itcl/itcl/Makefile.in
+++ itcl/itcl/Makefile.in
@@ -272,16 +272,16 @@ install-binaries: binaries install-lib-b
 #========================================================================
 
 install-libraries: libraries
-	$(mkinstalldirs) $(includedir)
-	@echo "Installing header files in $(includedir)"
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	@echo "Installing header files in $(DESTDIR)$(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)"
+	@echo "Installing library files in $(DESTDIR)$(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 +290,14 @@ install-libraries: libraries
 #========================================================================
 
 install-doc: doc
-	$(mkinstalldirs) $(mandir)/mann
-	@echo "Installing man pages in $(mandir)"
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/mann
+	@echo "Installing man pages in $(DESTDIR)$(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 +447,7 @@ install-lib-binaries: installdirs
 	    $(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 +485,7 @@ installdirs:
 	$(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
--- itcl/itk/Makefile.in
+++ itcl/itk/Makefile.in
@@ -267,16 +267,16 @@ install-binaries: binaries install-lib-b
 #========================================================================
 
 install-libraries: libraries
-	$(mkinstalldirs) $(includedir)
-	@echo "Installing header files in $(includedir)"
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	@echo "Installing header files in $(DESTDIR)$(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)"
+	@echo "Installing library files in $(DESTDIR)$(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 +285,14 @@ install-libraries: libraries
 #========================================================================
 
 install-doc: doc
-	$(mkinstalldirs) $(mandir)/mann
-	@echo "Installing man pages in $(mandir)"
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/mann
+	@echo "Installing man pages in $(DESTDIR)$(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 +421,7 @@ install-lib-binaries: installdirs
 	    $(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 +459,7 @@ installdirs:
 	$(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
--- itcl/iwidgets/Makefile.in
+++ itcl/iwidgets/Makefile.in
@@ -36,13 +36,13 @@ bindir = @bindir@
 # 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:

2007-03-07  Mike Frysinger  <vapier@gentoo.org>

	* unix/Makefile.in (INSTALL_ROOT): Default to $(DESTDIR).

--- tcl/unix/Makefile.in
+++ tcl/unix/Makefile.in
@@ -38,7 +38,7 @@ mandir			= @mandir@
 # 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

2007-03-07  Mike Frysinger  <vapier@gentoo.org>

	* unix/Makefile.in (INSTALL_ROOT): Default to $(DESTDIR).

--- tk/unix/Makefile.in
+++ tk/unix/Makefile.in
@@ -41,7 +41,7 @@ mandir			= @mandir@
 # 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

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]