Changeset 83391

Timestamp:

08/31/11 00:36:43 (4 years ago)

Author:

jmr@…

Message:

add SELFUPDATING variable to makefile to suppress message saying to selfupdate

Location:

trunk/base

Files:

• Makefile.in (modified) (1 diff)
• src/macports1.0/macports.tcl (modified) (1 diff)

trunk/base/Makefile.in

@@ -87 +87 @@
         $(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::

trunk/base/src/macports1.0/macports.tcl

@@ -3092 +3092 @@
             # 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"
             }