[interchange-cvs] interchange - jon modified Makefile.PL

[interchange-core@icdevgroup.org]

User:      jon
Date:      2003-01-24 05:11:53 GMT
Modified:  .        Tag: STABLE_4_8-branch Makefile.PL
Log:
Merge from trunk:

* When it is an update, don't send out "you are now ready to run makecat"
  message which confuses people.

Revision  Changes    Path
No                   revision



No                   revision



2.9.2.18  +14 -0     interchange/Makefile.PL


rev 2.9.2.18, prev_rev 2.9.2.17
Index: Makefile.PL
===================================================================
RCS file: /var/cvs/interchange/Makefile.PL,v
retrieving revision 2.9.2.17
retrieving revision 2.9.2.18
diff -u -u -r2.9.2.17 -r2.9.2.18
--- Makefile.PL	26 Nov 2002 03:21:07 -0000	2.9.2.17
+++ Makefile.PL	24 Jan 2003 05:11:53 -0000	2.9.2.18
@@ -452,6 +452,7 @@
 
 #warn "Got past mvtags build\n" ; #if $X{RPMBUILDDIR};
 
+	my $upgrade;
 	if($MV::Default{final}) {
 		$^W = 0;
 		for(glob "_*") {
@@ -514,6 +515,7 @@
 			File::Copy::copy($from, $to);
 		}
 		for (@files) {
+			$upgrade ||= -f "$realdir/$_";
 			install_file('.', $realdir, $_);
 		}
 		chdir '..';
@@ -660,12 +662,24 @@
 			}
 			system $^X, 'src/cpan_local_install', '-c';
 		}
+		if($upgrade) {
+		print <<EOF;
+
+Since this was an update, you are now ready to restart and ensure
+your catalogs run as expected. You do NOT need to re-run makecat,
+though you can always do that to make a new catalog. Never run
+makecat on an existing catalog.
+
+EOF
+		}
+		else {
 		print <<EOF;
 
 You are now ready to cd to $realdir and run 'bin/makecat'
 to set up your first catalog.
 
 EOF
+		}
 		exit;
 
 	}