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

diff --git a/debian/rules b/debian/rules
index 6fecafde..8ec4a576 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,18 +30,14 @@ configure-stamp:
 	autoconf
 	env CFLAGS=$(CFLAGS) \
 		./configure --prefix=/usr --sysconfdir=/etc \
-			--mandir=/usr/share/man --with-docbook=no \
-			$(WITHDEBUG)
-
+		--mandir=/usr/share/man	$(WITHDEBUG)
 	touch configure-stamp
 
 build: build-stamp
-
 build-stamp: configure-stamp 
 	dh_testdir
 
 	$(MAKE)
-
 	touch build-stamp
 
 clean:
@@ -50,9 +46,10 @@ clean:
 	rm -f build-stamp configure-stamp
 
 	-$(MAKE) clean
+	-$(MAKE) distclean
 	rm -f privoxy 
-	rm -f configure config.h config.h.in config.log config.cache \
-		config.status GNUmakefile
+	rm -f configure config.h GNUmakefile 
+	rm -f doc/source/ldp.dsl
 
 	dh_clean
 
@@ -65,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
 
@@ -76,10 +76,6 @@ install: build
 	rm -f $(DEBDIR)/etc/privoxy/templates/*~
 	rm -rf $(DEBDIR)/etc/privoxy/templates/CVS
 
-	cp -r doc/webserver/user-manual $(DEBDIR)/usr/share/doc/privoxy/
-	cp -r doc/webserver/faq $(DEBDIR)/usr/share/doc/privoxy/
-	cp -r doc/webserver/developer-manual $(DEBDIR)/usr/share/doc/privoxy/
-
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -90,7 +86,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
-	dh_installdocs
+	dh_installdocs -XCVS
 	dh_installexamples
 	dh_installmenu
 	dh_installlogrotate
@@ -115,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