[42979] branches/release_1_7

[blb at macports.org]

Revision: 42979
          http://trac.macports.org/changeset/42979
Author:   blb at macports.org
Date:     2008-12-02 17:31:52 -0800 (Tue, 02 Dec 2008)
Log Message:
-----------
Merge r42978 from trunk:
base/Makefile.in - make sure install of setupenv.bash respects DESTDIR; only
run upgrade_sources_conf_default.tcl and dep_map_clean.tcl when not
installing into some sort of destroot (as in, DESTDIR isn't set)

Modified Paths:
--------------
    branches/release_1_7/base/Makefile.in

Property Changed:
----------------
    branches/release_1_7/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962
   + /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978

Modified: branches/release_1_7/base/Makefile.in
===================================================================
--- branches/release_1_7/base/Makefile.in	2008-12-03 01:29:51 UTC (rev 42978)
+++ branches/release_1_7/base/Makefile.in	2008-12-03 01:31:52 UTC (rev 42979)
@@ -37,11 +37,14 @@
 include Mk/macports.subdir.mk
 
 install::
-	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 setupenv.bash  ${datadir}/macports/
+	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 setupenv.bash  $(DESTDIR)${datadir}/macports/
+# Only run these scripts when not building in a destroot
+ifeq ($(DESTDIR),)
 # Add [default] tag to the central MacPorts repository, if it isn't already
 	$(TCLSH) src/upgrade_sources_conf_default.tcl ${prefix}
 # Remove duplicate entries from the dependency map (could occur with 1.6 and earlier):
 	$(TCLSH) src/dep_map_clean.tcl ${TCL_PACKAGE_DIR}
+endif
 	@echo ""; echo "Congratulations, you have successfully installed the MacPorts system. To get the Portfiles and update the system, run:"; echo ""
 	@echo "sudo port -v selfupdate"; echo ""
 	@echo "Please read \"man port\", the MacPorts guide at http://guide.macports.org/ and Wiki at http://trac.macports.org/ for full documentation."; echo ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081202/dae38602/attachment.html>