Syncing with 3.0 branch. Not tested.

[privoxy.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index a8c0f0a..8ec4a57 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,11 +28,9 @@ configure-stamp:
 
        autoheader
        autoconf
-       env CFLAGS=$(CFLAGS) WDUMP=w3m \
+       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
@@ -40,8 +38,6 @@ build-stamp: configure-stamp
        dh_testdir
 
        $(MAKE)
-       $(MAKE) dok-devel dok-user dok-faq
-
        touch build-stamp
 
 clean:
@@ -66,6 +62,7 @@ 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
@@ -114,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