X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=63e4111897de240fdb0e6a25b1a58ab5e0055dbd;hb=e6e3ba12e69e3a022fc24b0d71a3df32e0a90b85;hp=06fb8a219733b7d5caa4c7fe474d2a5b7dbef8ca;hpb=6759f5f0423321ceef23f32cc078a6c9aa5aa168;p=privoxy.git

diff --git a/debian/rules b/debian/rules
index 06fb8a21..63e41118 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,16 +22,22 @@ 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
 
 	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) $(WITHOUTPTHREAD) \
+		--with-docbook=no
 
 	touch configure-stamp
 
@@ -40,7 +46,6 @@ build-stamp: configure-stamp
 	dh_testdir
 
 	$(MAKE)
-	$(MAKE) dok-devel dok-user dok-faq
 
 	touch build-stamp
 
@@ -69,6 +74,8 @@ install: build
 	    -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