nocpaninstall option added, needed to fix the longstanding

Debian bug #93669
interchange · Aug 12, 2001 · 7de922a · 7de922a
1 parent 0b0c3ad
commit 7de922a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -618,13 +618,26 @@ EOF
 		}
 		if(@mods_to_get) {
 			my $mods = join "\n\t", @mods_to_get;
-			print <<EOF;
+
+			if ($MV::Default{nocpaninstall}) {
+				print <<EOF;
+You do not appear to have all the required modules installed. You are missing:
+
+	$mods
+
+Please run src/cpan_local_install to install them.
+EOF
+  				exit 1;
+			} else {
+				print <<EOF;
 You do not appear to have all the required modules installed. You are missing:
 
 	$mods
 
 Trying to install now.
 EOF
+			}
+
 			chdir $realdir
 				or die "Couldn't change directory to $realdir: $!\n";
 			system $^X, 'src/cpan_local_install';
@@ -698,7 +711,7 @@ sub MY::install {
 VERBINST=0
 
 mv_install ::
-			\$(PERL) Makefile.PL force $uidparm final=\$(INSTALLARCHLIB)
+			\$(PERL) Makefile.PL force nocpaninstall=\$(NOCPANINSTALL) $uidparm final=\$(INSTALLARCHLIB)
 
 install :: all pure_install doc_install mv_install
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,7 @@
 interchange (4.8.1-1) unstable; urgency=low
 
   * new upstream release (Closes: #102645 due to new build)
+  * pass new NOCPANINSTALL variable during install (Closes: #93669)
   * foundation is now the demo catalog instead of construct
   * interchange wrapper handles now PID and sockets directives
     instead of putting it into the configuration file
@@ -21,7 +22,7 @@ interchange (4.8.1-1) unstable; urgency=low
   * dependencies to debconf added to interchange-ui and
     interchange-cat-foundation to keep lintian happy
 
- -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun, 12 Aug 2001 20:17:32 +0200
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun, 12 Aug 2001 23:20:58 +0200
 
 interchange (4.6.5-1) unstable; urgency=high
 

diff --git a/debian/rules b/debian/rules
@@ -68,7 +68,7 @@ install: build
 	dh_installdirs
 
 # Add here commands to install the package into debian/tmp.
-	$(MAKE) install PREFIX=$(TMP)/usr INSTALLARCHLIB=$(TMP)/usr/lib/interchange INSTALLPRIVLIB=$(TMP)/usr/lib/interchange INSTALLMAN1DIR=$(TMP)/usr/share/man/man1 INSTALLMAN3DIR=$(TMP)/usr/share/man/man8
+	$(MAKE) install PREFIX=$(TMP)/usr INSTALLARCHLIB=$(TMP)/usr/lib/interchange INSTALLPRIVLIB=$(TMP)/usr/lib/interchange INSTALLMAN1DIR=$(TMP)/usr/share/man/man1 INSTALLMAN3DIR=$(TMP)/usr/share/man/man8 NOCPANINSTALL=1
 # Sample configuration file not needed (code in interchange.PL
 # to determine configuration file location will stop to work too)
 	rm $(TMP)/usr/lib/interchange/interchange.cfg.dist