merge upstream 3.2.4

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2177 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 20 insertions, 7 deletions

diff --git a/docs-xml/scripts/find_missing_manpages.pl b/docs-xml/scripts/find_missing_manpages.pl
index c468d7d1ee..aa5751b44a 100755
--- a/docs-xml/scripts/find_missing_manpages.pl
+++ b/docs-xml/scripts/find_missing_manpages.pl
@@ -1,14 +1,25 @@
 #!/usr/bin/perl
 
-my %doc;
-
 $invar = 0;
-
 $topdir = (shift @ARGV) or $topdir = ".";
-
+$makefile = "$topdir/source/Makefile.in";
+$mandir = "$topdir/docs-xml/manpages-3";
 $progs = "";
 
-open(IN, "$topdir/Makefile.in");
+chdir($topdir);
+
+if(! -e "$makefile") {
+	print "$makefile does not exist!\n";
+	print "Wrong directory?\n";
+	exit(1);
+}
+
+if(! -d "$mandir") {
+        print "$mandir does not exist!\n";
+        exit(1);
+}
+
+open(IN, "$makefile");
 while(<IN>) {
 	if($invar && /^([ \t]*)(.*?)([\\])$/) {
 		$progs.=" " . $2;
@@ -22,15 +33,17 @@ while(<IN>) {
 foreach(split(/bin\//, $progs)) {
 	next if($_ eq " ");
 	s/\@EXEEXT\@//g;
+	s/\@EXTRA_BIN_PROGS\@//g;
 	s/ //g;
 
 
 	$f = $_;
-	
+
 	$found = 0;
 
+
 	for($i = 0; $i < 9; $i++) {
-		if(-e "manpages/$f.$i.xml") { $found = 1; }
+		if(-e "$mandir/$f.$i.xml") { $found = 1; }
 	}
 
 	if(!$found) {