merge fix from david for warning during xml build

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 4b9510663a01f6eb87a139fbde56ca477483081b..7b221fc2a051df20a04fb2cfbcc3b08a9e18f7d6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,8 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR)
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 
 build: build/build-stamp
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 
 build: build/build-stamp

-build-doc: build/build-doc-stamp
+build-doc: build-manpages build/build-doc-stamp
+build-manpages: build/build-manpages-stamp

 
 # Note that this is unconditionally done first as part of loading environment.mak
 # The true is needed to force make to reload environment.mak after running
 
 # Note that this is unconditionally done first as part of loading environment.mak
 # The true is needed to force make to reload environment.mak after running


@@ -97,11 +98,16 @@ else
 endif
        touch $@
 
 endif
        touch $@
 

-build/build-doc-stamp: build/configure-stamp
+build/build-doc-stamp: build/build-manpages-stamp build/configure-stamp

        # Add here commands to compile the package.
        $(MAKE) doc
        touch $@
 
        # Add here commands to compile the package.
        $(MAKE) doc
        touch $@
 

+build/build-manpages-stamp: build/configure-stamp
+       # Add here commands to compile the package.
+       $(MAKE) manpages
+       touch $@
+

 clean:
        dh_testdir
 
 clean:
        dh_testdir
 


@@ -167,7 +173,7 @@ apt-doc: build-doc
 
 binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https
 apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
 
 binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https
 apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list

-apt: build build-doc
+apt: build build-manpages

        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@


@@ -231,7 +237,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install
        dh_builddeb -p$@
 
 apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates
        dh_builddeb -p$@
 
 apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates

-apt-utils: build
+apt-utils: build build-manpages

        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@