[83391] trunk/base

[jmr at macports.org]

Revision: 83391
          http://trac.macports.org/changeset/83391
Author:   jmr at macports.org
Date:     2011-08-31 00:36:43 -0700 (Wed, 31 Aug 2011)
Log Message:
-----------
add SELFUPDATING variable to makefile to suppress message saying to selfupdate

Modified Paths:
--------------
    trunk/base/Makefile.in
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in	2011-08-31 07:13:22 UTC (rev 83390)
+++ trunk/base/Makefile.in	2011-08-31 07:36:43 UTC (rev 83391)
@@ -86,9 +86,13 @@
 # Convert image directories (and direct mode installs) to image archives
 	$(TCLSH) src/images_to_archives.tcl "${macports_tcl_dir}"
 endif
+ifndef SELFUPDATING
 	@echo ""; echo "Congratulations, you have successfully installed the MacPorts system. To get the Portfiles and update the system, add ${prefix}/bin to your PATH and run:"; echo ""
 	@echo "sudo port -v selfupdate"; echo ""
 	@echo "Please read \"man port\", the MacPorts guide at http://guide.macports.org/ and Wiki at https://trac.macports.org/ for full documentation."; echo ""
+else
+	@echo ""; echo "Congratulations, you have successfully upgraded the MacPorts system."; echo ""
+endif
 
 group::
 	@echo "creating a macports group..." && sudo dseditgroup -o create -n . macports && echo "done! use './configure --with-install-group=macports --with-shared-directory' if you haven't already"

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2011-08-31 07:13:22 UTC (rev 83390)
+++ trunk/base/src/macports1.0/macports.tcl	2011-08-31 07:36:43 UTC (rev 83391)
@@ -3091,7 +3091,7 @@
 
             # do the actual configure, build and installation of new base
             ui_msg "Installing new MacPorts release in $prefix as $owner:$group; permissions $perms; Tcl-Package in $tclpackage\n"
-            if { [catch { system "cd $mp_source_path && ${cc_arg}./configure $configure_args && make && make install" } result] } {
+            if { [catch { system "cd $mp_source_path && ${cc_arg}./configure $configure_args && make && make install SELFUPDATING=1" } result] } {
                 return -code error "Error installing new MacPorts base: $result"
             }
             if {[info exists updatestatus]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110831/7a1885f3/attachment.html>