From: short <>
Date: Sun, 17 Aug 2003 07:16:25 +0000 (+0000)
Subject: Utilize gtkdocize(1) of gtk-doc-1.1.
X-Git-Tag: lufs_0_9_6_captive1~23
X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=commitdiff_plain;h=2398b65722a3a9afd10077e838a0ae8cfb24d142;hp=6c5a7edbfb5b833d42f0b9c4c4844ca366f32025

Utilize gtkdocize(1) of gtk-doc-1.1.
Fix 'autogen rpm' if --disable-gtk-doc is specified in spec file.
---

diff --git a/AutoGen.pm b/AutoGen.pm
index cad8cbf..f2e6978 100644
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -178,9 +178,11 @@ my($class,%args)=@_;
 	my($specsrc)=map((-e $_ ? $_ : "$name.spec.in"),"$name.spec.m4.in");
 	my $spec=_readfile $specsrc;
 	$spec=~s/\\\n/ /gs;
+	my $configure_args=($spec=~/^[%]configure\b[ \t]*(.*)$/m)[0];
+	$configure_args=~s/--disable-gtk-doc\b/--enable-gtk-doc/g;	# optional; gtk-doc reqd for 'make dist'
 	$class->run(%Options,
 			"ARGV"=>["--copy"],
-			"configure_args"=>[split /\s+/,($spec=~/^[%]configure\b[ \t]*(.*)$/m)[0]],
+			"configure_args"=>[split /\s+/,$configure_args],
 			);
 	_remove "ChangeLog";	# force its rebuild by Makefile/rcs2log
 	_system "make dist $name.spec";
@@ -259,11 +261,16 @@ sub _cleanfiles
 						sgml*
 						tmpl*
 						html*
+						xml
 						*.txt
 						*.txt.bak
+						*.new
+						*.sgml
 						*.args
 						*.hierarchy
 						*.signals
+						*.interfaces
+						*.prerequisites
 						)); }),$Options{"gtk-doc-dir"}),
 				map((!$_ ? () : do { my $dir=$_; map("$dir/$_",qw(
 						*.html