X-Git-Url: https://git.jankratochvil.net/?p=macros.git;a=blobdiff_plain;f=AutoGen.pm;h=fcd9374db302b5da2402f3a0f044b4ee59381a1c;hp=de75b419d98419d26ac0b307370bbff076711b1a;hb=f76175bae7cc191ed242eda8990a902fe13af3f6;hpb=0bd38062103d7233de8f542842a26f2b9635a3e3;ds=sidebyside

diff --git a/AutoGen.pm b/AutoGen.pm
index de75b41..fcd9374 100644
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -43,6 +43,9 @@ HERE
 		}
 	die "You are missing some modules - install them by:\n"
 					."\tperl -MCPAN -e 'install qw(".join(" ",@missing).")'\n"
+					."If you see messages: Writing Makefile for <packagename> -- NOT OK\n"
+					."you may did not have installed make(1) while configuring Perl CPAN.\n"
+					."Install make(1) and type 'o conf init' in: perl -MCPAN -e shell\n"
 			if @missing;
 	}
 
@@ -56,6 +59,9 @@ Beware: '.basename($0).' is a tool only for maintainers!
 Supported parameters:
  --rpm       Build RPM packages locally (needs /usr/src/(redhat|packages)/ access)
  --rpmtest   Build RPM like "rpm" but w/o gpg/pgp signing
+ --deb       Build DEB packages locally
+ --debtest   Build DEB like "deb" but w/o gpg/pgp signing
+ --dist      Prepare all build files but do not run the final "./configure"
  --clean     Standard cleanup method
  --fullclean Like clean but even the .cvsignore files are removed
  --copy      Behave exactly like in default mode but copy all instead of symlinks
@@ -214,20 +220,20 @@ my($class,%args)=@_;
 	$class->_prepdist($name);
 	_system "make $name.spec";
 	my $spec=_readfile "$name.spec";
-	my $patch=($spec=~/^Patch\d*:\s*(.*)$/m)[0];
+	my $patch=($spec=~/^Patch\d*\s*:\s*(.*)$/m)[0];
 	_system "make dist";
 	if (!$patch) {
 		_copy "$name-*.tar.gz",_rpmeval("_sourcedir");
 		}
 	else {
 		my @origs;
-		for my $glob ("orig-$name-*.tar.{gz,Z}") {
+		for my $glob ("orig-$name-*.tar.{gz,Z,bz2}") {
 			@origs=glob $glob;
 			confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
 			}
-		my $base=($origs[0]=~/^orig-(.*)[.]tar[.](?:gz|Z)$/)[0];
+		my($base,$ext)=($origs[0]=~/^orig-(.*)[.]tar[.](gz|Z|bz2)$/);
 		_copy $origs[0],_rpmeval("_sourcedir")."/".($origs[0]=~/^orig-(.*)$/)[0];
-		_system "tar xzf ".$origs[0];
+		_system "tar x".($ext eq "bz2" ? "j" : "z")."f ".$origs[0];
 		_mkdir $base."-orig";
 		# FIXME: Copy also dot-prefixed files!
 		_move \1,$base."/*",$base."-orig/";
@@ -267,7 +273,7 @@ my($class,%args)=@_;
 	_system "make distdir";
 	# Copy 'orig' archive after &_prepdist which would delete it.
 	my @origs;
-	for my $glob ("orig-$name-*.tar.{gz,Z}") {
+	for my $glob ("orig-$name-*.tar.{gz,Z,bz2}") {
 		@origs=glob $glob;
 		if (@origs) {
 			confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
@@ -341,6 +347,7 @@ sub _cleanfiles
 						./debian/tmp ./debian/<name>
 						./<name>*_[0-9]*
 						./macros/macros.dep
+						./macros/glade-w.sh
 						./po/Makefile.in.in ./po/POTFILES* ./po/cat-id-tbl.c ./po/cat-id-tbl.tmp
 						./po/*.gmo ./po/*.mo ./po/stamp-cat-id ./po/<name>.pot ./po/ChangeLog
 						./po/Makevars ./po/Makevars.template ./po/Rules-quot ./po/*.sed ./po/*.sin ./po/*.header
@@ -585,6 +592,7 @@ my($class,%options)=@_;
      cat $tmp/out
      rm -f $tmp/out
 CONFIGURE_SUBST_X_EOF
+	_remove "nocheck","./configure.orig";	# It is usually produced by 'CONFIGURE_SUBST_X'.
 	# Why it is left there after RedHat autoconf-2.53-8 ?
 	_remove "nocheck",\1,"autom4te-*.cache";