X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=blobdiff_plain;f=AutoGen.pm;h=de75b419d98419d26ac0b307370bbff076711b1a;hp=8f5399d2ee8e2102cafcda1c66f2c9c30f4ca4c1;hb=0bd38062103d7233de8f542842a26f2b9635a3e3;hpb=a836346ee6fb7a12766559562a00b0675ad48a59

diff --git a/AutoGen.pm b/AutoGen.pm
index 8f5399d..de75b41 100644
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -222,7 +222,7 @@ my($class,%args)=@_;
 	else {
 		my @origs;
 		for my $glob ("orig-$name-*.tar.{gz,Z}") {
-			@origs=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];
@@ -265,12 +265,27 @@ my($class,%args)=@_;
 	my $name=$Options{"name"};
 	$class->_prepdist($name);
 	_system "make distdir";
-	_system(join(" ","cd $name-*;dpkg-buildpackage",
+	# Copy 'orig' archive after &_prepdist which would delete it.
+	my @origs;
+	for my $glob ("orig-$name-*.tar.{gz,Z}") {
+		@origs=glob $glob;
+		if (@origs) {
+			confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
+			(my $deborig=$origs[0])=~s/^orig-([^-]+)-(.*)([.]tar[.][^.]+)$/$1_$2.orig$3/;
+			_copy $origs[0],$deborig;
+			}
+		}
+	my @subdirs;
+	for my $glob ("$name-*") {
+		@subdirs=glob $glob;
+		confess "Invalid glob $glob: ".join(",",@subdirs) if 1!=@subdirs;
+		}
+	_system(join(" ","cd ".$subdirs[0].";dpkg-buildpackage",
 			"-rfakeroot",
 			($args{"sign"} ? () : ("-us","-uc")),
 			));
-	_remove \1,"$name-*";
-	_system "ls -l ${name}_*";
+	_remove \1,$subdirs[0];
+	_system "ls -l ${name}*_[0-9]*";
 	exit 0;	# should never return
 }
 
@@ -321,10 +336,10 @@ sub _cleanfiles
 						./mkinstalldirs
 						./libtool ./ltconfig ./ltmain.sh
 						./ABOUT-NLS
-						./<name>-[0-9]* ./<name>-devel-[0-9]*
+						./<name>-[0-9]* ./<name>-*-[0-9]*
 						./<name>.spec ./<name>.m4 ./<name>.spec.m4
 						./debian/tmp ./debian/<name>
-						./<name>_[0-9]*
+						./<name>*_[0-9]*
 						./macros/macros.dep
 						./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
@@ -457,6 +472,7 @@ my($class,%options)=@_;
 			  "rpmtest"  ,sub { $class->_rpmbuild("sign"=>0); },
 			  "deb"      ,sub { $class->_debbuild("sign"=>1); },
 			  "debtest"  ,sub { $class->_debbuild("sign"=>0); },
+			  "cleanfilesfordir=s",sub { print "$_\n" for (_cleanfilesfordir $_[1]); exit 0; },
 			  "dist"     ,\$Options{"ARGV_dist"},
 			  "copy!"    ,\$Options{"ARGV_copy"},
 			  "fullclean",\$Options{"ARGV_fullclean"},
@@ -480,14 +496,18 @@ my($class,%options)=@_;
 	return if $Options{"ARGV_clean"} || $Options{"ARGV_fullclean"};
 
 	$Options{"aclocal_args"}=[qw(-I macros),map((!$_ ? () : @$_),$Options{"aclocal_args"})];
-	my $configure_in=_readfile("configure.in");
-	do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GNU_GETTEXT\b/m; }
+	my $configure_name;
+	do { $configure_name||=$_ if -f $_ } for ("configure.in");
+	do { $configure_name||=$_ if -f $_ } for ("configure.ac");
+	$configure_name or confess "Cannot find configure.{in,ac}";
+	my $configure_in=_readfile($configure_name);
+	do { $$_=1 if !defined($$_) && $configure_in=~/^\s*AM_GNU_GETTEXT\b/m; }
 			for (\$Options{"want-gettextize"});
-	do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GLIB_GNU_GETTEXT\b/m; }
+	do { $$_=1 if !defined($$_) && $configure_in=~/^\s*AM_GLIB_GNU_GETTEXT\b/m; }
 			for (\$Options{"want-glib-gettextize"});
-	do { $$_=1 if !defined($$_) && $configure_in=~/^AM_PROG_LIBTOOL\b/m; }
+	do { $$_=1 if !defined($$_) && $configure_in=~/^\s*AM_PROG_LIBTOOL\b/m; }
 			for (\$Options{"want-libtoolize"}); 
-	do { $$_=1 if !defined($$_) && $configure_in=~/^A[CM]_CONFIG_HEADER\b/m; }
+	do { $$_=1 if !defined($$_) && $configure_in=~/^\s*A[CM]_CONFIG_HEADER\b/m; }
 			for (\$Options{"want-autoheader"});
 	my @copy_arg=(!$Options{"ARGV_copy"} ? () : "--copy");
 
@@ -501,7 +521,7 @@ my($class,%options)=@_;
 				."'") {
 			_system $_ and confess $_;
 			}
-		for ("configure.in","Makefile.am") {
+		for ($configure_name,"Makefile.am") {
 			STDERR->printflush("gettextize recovery rename \"$_~\"->\"$_\"... ");
 			rename "$_~","$_" or confess "$!";
 			STDERR->printflush("ok\n");