[26216] trunk/base/Makefile.in

[source_changes at macosforge.org]

Revision: 26216
          http://trac.macosforge.org/projects/macports/changeset/26216
Author:   jmpp at macports.org
Date:     2007-06-15 18:08:04 -0700 (Fri, 15 Jun 2007)

Log Message:
-----------
Also echo information only if the upgrade hasn't been already run.

Modified Paths:
--------------
    trunk/base/Makefile.in

Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in	2007-06-16 00:31:24 UTC (rev 26215)
+++ trunk/base/Makefile.in	2007-06-16 01:08:04 UTC (rev 26216)
@@ -27,7 +27,7 @@
 	fi
 
 upgrade:
-	@echo -e "\nUpgrading your existing MacPorts installation to the new layout:\n"
+	@[ -f ${sysconfdir}/macports/.mprename_update ] || echo -e "\nUpgrading your existing MacPorts installation to the new layout:\n"
 
 # We can safely delete the ${TCL_PACKAGE_DIR}/darwinports1.0 dir as files in it are always overwritten and will now be installed onto
 # ${TCL_PACKAGE_DIR}/macports1.0 with new names:
@@ -139,7 +139,7 @@
 #something more?
 
 # Upgrade success announcement (meaning we're done ;):
-	@echo -e "\nMacPorts installation successfully upgraded from the old DarwinPorts namespace!\n"
+	@[ -f ${sysconfdir}/macports/.mprename_update ] || echo -e "\nMacPorts installation successfully upgraded from the old DarwinPorts namespace!\n"
 
 ####
 # NOTES:
@@ -157,8 +157,7 @@
 	@echo -e "\nCongratulations, you have successfully installed the MacPorts system. To get the Portfiles and update the system, run:\n"
 	@echo -e "sudo port selfupdate\n"
 	@echo -e "Please read port(1) and the MacPorts Wiki at http://trac.macports.org/ for full documentation.\n"
-	@echo -e "Stray sources might have been left in the legacy ${localstatedir}/db/dports directory after this upgrade,"
-	@echo -e "which moved most of what it could to ${localstatedir}/macports, so you might want to look in the former and cleanup manually.\n"
+	@[ -f ${sysconfdir}/macports/.mprename_update ] || echo -e "Stray sources might have been left in the legacy ${localstatedir}/db/dports directory after this upgrade, which moved most of what it could to ${localstatedir}/macports, so you might want to look in the former and cleanup manually.\n"
 
 clean::
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070615/9d278ca2/attachment.html