[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.14-11-g171a400



The following commit has been merged in the master branch:
commit 171a40065df7217df8b59ff5b8ec47249d1a19ab
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jun 30 10:12:08 2013 +0200

    d/rules: Pass an output dir to generate-html-docs
    
    This ensures that the auto-generated docs are removed in clean.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/rules b/debian/rules
index 5ab7db9..b6d9b60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ $(profiles): $(allchecks) $(autoreject_data) private/generate-profiles.pl
 	private/generate-profiles.pl
 
 api-doc:
-	private/generate-html-docs
+	private/generate-html-docs doc/api.html
 
 runtests: $(neededfiles) $(allchecks) $(allcollect) $(tagfiles) $(testfiles)
 	@echo .... running tests ....
@@ -73,7 +73,7 @@ build-stamp: $(neededfiles) $(docsource) $(testtarget)
 	pod2man --section=1 man/lintian-info.pod > man/man1/lintian-info.1
 	LINTIAN_ROOT="" ./frontend/lintian --help \
 		| tail -n +3 | $(PERL) -n -e 'print "  $$_"' >doc/help.tmp
-	private/generate-html-docs > /dev/null
+	private/generate-html-docs doc/api.html > /dev/null
 	$(PERL) -p -e 'BEGIN { open HELP, "<", "doc/help.tmp" or die; local $$/ = undef; $$h = <HELP> }; s/%LINTIAN_HELP%/$$h/' doc/README.in >doc/README
 
 	# check that the static data about perl core modules is up to date
diff --git a/private/generate-html-docs b/private/generate-html-docs
index a9c52a4..f7ca4d6 100755
--- a/private/generate-html-docs
+++ b/private/generate-html-docs
@@ -9,7 +9,6 @@ use Pod::Simple::HTML;
 
 my (@input, $output, $version);
 
-$version = pop @ARGV;
 $output = pop @ARGV;
 @input = @ARGV;
 

-- 
Debian package checker


Reply to: