X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=8ec4a57614f417b193c0752b236e1f6870df547c;hb=ac0b0e5c8a6d7b405e763c2cf8b7226598405de4;hp=be5438e62be8cd9b03e6b56e2e85dfba70b4d742;hpb=daecd4737ed179358a8f8b415f1a61b881d3ad1e;p=privoxy.git

diff --git a/debian/rules b/debian/rules
index be5438e6..8ec4a576 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,6 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEBDIR=`pwd`/debian/privoxy
 
-DB2HTML=jw -f docbook -b html -d `pwd`/ldpOK.dsl\#html
-
-
 CFLAGS="-O2"
 WITHDEBUG=""
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -33,9 +30,7 @@ configure-stamp:
 	autoconf
 	env CFLAGS=$(CFLAGS) \
 		./configure --prefix=/usr --sysconfdir=/etc \
-		--mandir=/usr/share/man	$(WITHDEBUG) \
-		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
-
+		--mandir=/usr/share/man	$(WITHDEBUG)
 	touch configure-stamp
 
 build: build-stamp
@@ -43,17 +38,6 @@ build-stamp: configure-stamp
 	dh_testdir
 
 	$(MAKE)
-
-# 	And now we create the documentation (manually):
-	$(MAKE) doc/source/ldpOK.dsl
-	(cd doc/source; \
-	 $(DB2HTML) -o faq faq.sgml; \
-	 $(DB2HTML) -o user-manual user-manual.sgml; \
-	 $(DB2HTML) -o developer-manual developer-manual.sgml; \
-	 docbook2txt faq.sgml; \
-	 docbook2txt user-manual.sgml; \
-	 docbook2txt developer-manual.sgml)
-
 	touch build-stamp
 
 clean:
@@ -61,13 +45,11 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) clobber
+	-$(MAKE) clean
+	-$(MAKE) distclean
 	rm -f privoxy 
 	rm -f configure config.h GNUmakefile 
-	rm -f doc/source/ldpOK.dsl
-	rm -rf doc/source/faq doc/source/user-manual \
-		doc/source/developer-manual
-	rm -f doc/source/*.txt
+	rm -f doc/source/ldp.dsl
 
 	dh_clean
 
@@ -80,10 +62,13 @@ install: build
 	install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
 
 	sed -e 's/^\(\(trust\|proxy\)-info-url\|admin-address\)/#\1/'  \
+	    -e 's/^\(enable-\(edit-actions\|remote-toggle\)\)/#\1/' \
 	    -e 's#^confdir \.#confdir /etc/privoxy#' \
 	    -e 's#^logdir \.#logdir /var/log/privoxy#' \
 		< config > $(DEBDIR)/etc/privoxy/config
 	install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
+	install -m 0644 standard.action $(DEBDIR)/etc/privoxy/standard.action
+	install -m 0644 user.action $(DEBDIR)/etc/privoxy/user.action
 	install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter
 	install -m 0644 trust $(DEBDIR)/etc/privoxy/trust
 
@@ -101,7 +86,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
-	dh_installdocs
+	dh_installdocs -XCVS
 	dh_installexamples
 	dh_installmenu
 	dh_installlogrotate
@@ -126,5 +111,9 @@ binary-arch: build install
 	dh_md5sums
 	dh_builddeb
 
+# Single step doc building on debian
+debian-dok: configure-stamp
+	$(MAKE) dok
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure debian-dok