From 2398b65722a3a9afd10077e838a0ae8cfb24d142 Mon Sep 17 00:00:00 2001 From: short <> Date: Sun, 17 Aug 2003 07:16:25 +0000 Subject: [PATCH] Utilize gtkdocize(1) of gtk-doc-1.1. Fix 'autogen rpm' if --disable-gtk-doc is specified in spec file. --- AutoGen.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 -- 1.8.3.1