X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=021c9d52d219735b66b7f6b70697cd627ac12371;hb=1089771ea845280e92d4a70e60d96c15ad56c655;hp=956dc26f8b26ff7336d2e26e68253a7ec7fecde5;hpb=50ab6770dcde9687232607904786d7f040b259fc;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 956dc26f..021c9d52 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.91 2002/04/27 04:44:51 morcego Exp $
+# $Id: GNUmakefile.in,v 1.94 2002/04/27 08:23:29 swa Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -533,13 +533,15 @@ tarball-clean:
 #
 #############################################################################
 
+# now works for swa
 # our style file
 doc/source/ldpOK.dsl:
-	if [ "$(DKPREFIX)" != "none" ]; then \
-		sed -e "s@/usr/share/sgml/docbook/dsssl-stylesheets@$(DKPREFIX)@g" doc/source/ldp.dsl > doc/source/ldpOK.dsl; \
-	else \
-		cp doc/source/ldp.dsl doc/source/ldpOK.dsl; \
-	fi
+#	if [ "$(DKPREFIX)" != "none" ]; then \
+#		sed -e "s@/usr/share/sgml/docbook/dsssl-stylesheets@$(DKPREFIX)@g" doc/source/ldp.dsl > doc/source/ldpOK.dsl; \
+#	else \
+#		cp doc/source/ldp.dsl doc/source/ldpOK.dsl; \
+#	fi
+	cp doc/source/ldp.dsl doc/source/ldpOK.dsl;
 
 # Otherwise we get plain groff conversion.
 groff2html:
@@ -673,12 +675,15 @@ else
 endif
 
 dok-pdf: doc/source/ldpOK.dsl dok-release 
-	cp doc/source/*.sgml doc/pdf
-	cp doc/source/*.dsl doc/pdf
-	cd doc/pdf && db2pdf --pdf -s ldpOK.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf
-	cd doc/pdf && db2pdf --pdf -s ldpOK.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf
-	cd doc/pdf && db2pdf --pdf -s ldpOK.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf
+	rm -f doc/pdf/*.pdf
+	cp -f doc/source/*.sgml doc/pdf
+	cp -f doc/source/*.dsl doc/pdf
+	cd doc/pdf && db2pdf --pdf -s ldpOK.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf > /dev/null 2>&1
+	cd doc/pdf && db2pdf --pdf -s ldpOK.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf > /dev/null 2>&1
+	cd doc/pdf && db2pdf --pdf -s ldpOK.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf > /dev/null 2>&1
 	rm -f doc/pdf/*.sgml doc/pdf/*.dsl doc/pdf/*.out doc/pdf/*.tex doc/pdf/*.log doc/pdf/*.aux
+	# kludge to force recreation on next run. Rodgrigo?
+	@rm -f doc/source/ldpOK.dsl
 
 # the layout and style with db2pdf sucks, here is an alternative
 dok-pdf2: doc/source/ldpOK.dsl dok-release 
@@ -687,6 +692,8 @@ dok-pdf2: doc/source/ldpOK.dsl dok-release
 	cd doc/source && $(DB) -V nochunks developer-manual.sgml > temp/privoxy-developer-manual.html
 	cd doc/source && $(DB) -V nochunks faq.sgml > temp/privoxy-faq.html
 # one could use html2ps and ps2pdf. well, that does not work. htmlps produces incorrect output.
+	# kludge to force recreation on next run. Rodgrigo?
+	@rm -f doc/source/ldpOK.dsl
 
 #############################################################################
 #
@@ -796,7 +803,8 @@ tidy:
 	$(RM) `find . -name ".\#*"`
 
 clobber: tidy
-	$(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *.tar.gz *.tar
+	$(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldpOK.dsl
+
 #
 # FIXME: What is all this? 
 #
@@ -834,6 +842,16 @@ install: all
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.94  2002/04/27 08:23:29  swa
+# pdf process reviewed and cleaned up
+#
+# Revision 1.93  2002/04/27 04:55:53  morcego
+# privoxy-cl.spec now gets removed by clobber target
+#
+# Revision 1.92  2002/04/27 04:53:40  morcego
+# Adding --exclude "PACKAGERS" to every tar command that applies (not for
+#   webserver target)
+#
 # Revision 1.91  2002/04/27 04:44:51  morcego
 # GNUmakefile.in: The tarball created on redhat-dist and suse-dist now ignore
 #   the PACKAGERS file, as well privoxy-cl.spec (in case it was created)