This is most of Al's patch for --with-user and --with-group which tests that

[privoxy.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 6fecafd..63e4111 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,12 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
        WITHDEBUG="--with-debug"
 endif
 
+# hppa doesn't support -pthread option, so we complety disable pthread
+# on hppa until there is a better solution in configure.
+ifeq "$(DEB_HOST_GNU_TYPE)" "hppa-linux"
+       WITHOUTPTHREAD="--disable-pthread"
+endif
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
@@ -30,13 +36,12 @@ configure-stamp:
        autoconf
        env CFLAGS=$(CFLAGS) \
                ./configure --prefix=/usr --sysconfdir=/etc \
-                       --mandir=/usr/share/man --with-docbook=no \
-                       $(WITHDEBUG)
+               --mandir=/usr/share/man $(WITHDEBUG) $(WITHOUTPTHREAD) \
+               --with-docbook=no
 
        touch configure-stamp
 
 build: build-stamp
-
 build-stamp: configure-stamp 
        dh_testdir
 
@@ -50,9 +55,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 +71,15 @@ 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#' \
+           -e 's/\(Sample Configuration File for Privoxy\).*/\1/' \
+           -e 's/Id: config,v.*/Id: config,v $$/' \
                < 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 +87,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 +97,7 @@ binary-arch: build install
        dh_testdir
        dh_testroot
 #      dh_installdebconf       
-       dh_installdocs
+       dh_installdocs -XCVS
        dh_installexamples
        dh_installmenu
        dh_installlogrotate