X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=04933670aab9a9d37feb522799128ca0ecda3a2e;hb=2fdcad5d38e5a63296391ab509c72181b6a1d04a;hp=69f12d715fe3f8c15cbcce41bb82c9652d2cc341;hpb=aa2147c93f4d9d99d9404a9b6ab6691cbad2f7ff;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 69f12d71..04933670 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.4 2002/01/17 21:44:04 jongfoster Exp $ +# $Id: GNUmakefile.in,v 1.8 2002/03/05 14:07:42 morcego Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,20 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: GNUmakefile.in,v $ +# Revision 1.8 2002/03/05 14:07:42 morcego +# configure now detects rpm topdir, and change GNUmakefile acordingly +# (based on sugestion by Sarantis Paskalis) +# +# Revision 1.7 2002/03/05 13:43:28 morcego +# Checking for text browser, so redhat-dok can work. +# +# Revision 1.6 2002/03/05 13:10:51 morcego +# Changes to implement redhat-dok (Hal Burgiss) +# Changes to make it work on other distros and out-of-the-shelf configurations +# +# Revision 1.5 2002/02/27 15:30:39 hal9 +# Reset $(RPM_PACKAGEV) to 1 (was 2) +# # Revision 1.4 2002/01/17 21:44:04 jongfoster # Adding urlmatch.[ch] # @@ -247,6 +261,10 @@ MV = mv TAR = tar MAKE = make LN = ln +WDUMP = @WDUMP@ -dump +JADEBIN = @JADEBIN@ +DB = $(JADEBIN) -t sgml -ihtml -D.. -d ldpOK.dsl\#html +DKPREFIX = @DKPREFIX@ # Program to do LF->CRLF # @@ -262,7 +280,7 @@ DOSFILTER = perl -p -e 's/\n/\r\n/' ############################################################################# TAR_ARCH = /tmp/ijbswa-$(RPM_VERSION).tar.gz -RPM_BASE = /usr/src/redhat +RPM_BASE = @RPM_BASE@ ############################################################################# # Filenames and libraries @@ -348,7 +366,8 @@ all: $(PROGRAM) # Phony targets ############################################################################# .PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \ -suse-upload win-dist tarball-dist dok webserver clean clobber tags install +suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \ +install ############################################################################# @@ -491,20 +510,50 @@ tarball-dist: # converts doc/source/*.sgml into html, text and man pages # ############################################################################# -dok: +dok: doc/source/ldpOK.dsl mkdir -p doc/text doc/man # user manual rm -rf doc/webserver/user-manual - cd doc/source && db2html -s ldp.dsl user-manual.sgml && mv user-manual ../webserver - cd doc/source && db2html -s ldp.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual + cd doc/source && db2html -s ldpOK.dsl user-manual.sgml && mv user-manual ../webserver + cd doc/source && db2html -s ldpOK.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual ## developer manual rm -rf doc/webserver/developer-manual - cd doc/source && db2html -s ldp.dsl developer-manual.sgml && mv developer-manual ../webserver - cd doc/source && db2html -s ldp.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual + cd doc/source && db2html -s ldpOK.dsl developer-manual.sgml && mv developer-manual ../webserver + cd doc/source && db2html -s ldpOK.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual ## faq rm -rf doc/webserver/faq - cd doc/source && db2html -s ldp.dsl faq.sgml && mv faq ../webserver - cd doc/source && db2html -s ldp.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq + cd doc/source && db2html -s ldpOK.dsl faq.sgml && mv faq ../webserver + cd doc/source && db2html -s ldpOK.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq + +redhat-dok: doc/source/ldpOK.dsl + mkdir -p doc/text doc/man doc/source/user-manual \ + doc/source/developer-manual doc/source/faq +## user manual + rm -rf doc/webserver/user-manual + cd doc/source/user-manual && $(DB) ../user-manual.sgml && cd .. &&\ + mv user-manual ../webserver + cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && \ + $(WDUMP) tmp.html > ../text/user-manual.txt && rm -rf tmp.html \ + user-manual +## developer manual + rm -rf doc/webserver/developer-manual + cd doc/source/developer-manual && $(DB) ../developer-manual.sgml &&\ + cd .. && mv developer-manual ../webserver + cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && \ + $(WDUMP) tmp.html > ../text/developer-manual.txt && rm -rf tmp.html \ + developer-manual +## faq + rm -rf doc/webserver/faq + cd doc/source/faq && $(DB) ../faq.sgml && cd .. && mv faq ../webserver + cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) \ + tmp.html > ../text/faq.txt && rm -rf tmp.html faq + +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 ############################################################################# # @@ -515,7 +564,7 @@ dok: ############################################################################# webserver: @$(ECHO) ------------------------------------------------------- - @$(ECHO) You have run make dok before, right? + @$(ECHO) You have run make dok/redhat-dok before, right? @$(ECHO) Note that this command scps all stuff to the webserver, @$(ECHO) it will not remove obsolete documents. @$(ECHO) -------------------------------------------------------