Removed build dependency on docbook by making generation of docs a

seperate target: debian-dok.

diff --git a/debian/changelog b/debian/changelog
index 78cce24..d764260 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+privoxy (3.1.1-alpha-0) unstable; urgency=low
+
+  * Added debian-dist and debian-upload targets to the top level makefile.
+    debian-dist runs "dpkg-buildpackage -rfakeroot -us -uc" so that
+    any debian user can build it.
+  * Removed build dependency on docbook, leaving generation of docs to
+    another target or makefile.
+  
+ -- Devin John Bayer <devin@debian>  Sat, 25 May 2002 22:49:30 -0400
+

 privoxy (2.9.15-beta-0) unstable; urgency=low
 
   * New upstream version.
 privoxy (2.9.15-beta-0) unstable; urgency=low
 
   * New upstream version.

diff --git a/debian/control b/debian/control
index 2d235d7..5046450 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: privoxy
 Section: web
 Priority: optional
 Maintainer: Roland Rosenfeld <roland@debian.org>
 Section: web
 Priority: optional
 Maintainer: Roland Rosenfeld <roland@debian.org>

-Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev, docbook-utils, w3m
+Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev, w3m

 Standards-Version: 3.5.6
 
 Package: privoxy
 Standards-Version: 3.5.6
 
 Package: privoxy

diff --git a/debian/rules b/debian/rules
index 06fb8a2..0602dfc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,6 @@ configure-stamp:
                ./configure --prefix=/usr --sysconfdir=/etc \
                --mandir=/usr/share/man $(WITHDEBUG) \
                --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
                ./configure --prefix=/usr --sysconfdir=/etc \
                --mandir=/usr/share/man $(WITHDEBUG) \
                --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular

-

        touch configure-stamp
 
 build: build-stamp
        touch configure-stamp
 
 build: build-stamp


@@ -40,8 +39,6 @@ build-stamp: configure-stamp
        dh_testdir
 
        $(MAKE)
        dh_testdir
 
        $(MAKE)

-       $(MAKE) dok-devel dok-user dok-faq
-

        touch build-stamp
 
 clean:
        touch build-stamp
 
 clean:


@@ -115,5 +112,10 @@ binary-arch: build install
        dh_md5sums
        dh_builddeb
 
        dh_md5sums
        dh_builddeb
 

+# Use this target on Debian because we need to make sure configure
+# was run with docbook's correct path (see configure-stamp above)
+debian-dok: configure-stamp
+       $(MAKE) dok
+

 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure