summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-12-07 17:54:11 +0100
committerMichael Vogt <mvo@debian.org>2013-12-07 17:54:11 +0100
commit8fafb8adc032002284f53359e1308efa609f9239 (patch)
tree2348ae1953446a069c0e44bcd20915c22c4d89b1 /vendor
parentbc435af429f427c6a5db971c3d4cc7f15a2fe55d (diff)
parentce34af08ad6866869147e3525fa6c89d8dcb4601 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog debian/gbp.conf
Diffstat (limited to 'vendor')
-rw-r--r--vendor/debian/makefile2
-rw-r--r--vendor/makefile3
-rw-r--r--vendor/ubuntu/makefile2
3 files changed, 4 insertions, 3 deletions
diff --git a/vendor/debian/makefile b/vendor/debian/makefile
index 42c86e1c4..1f82d7f47 100644
--- a/vendor/debian/makefile
+++ b/vendor/debian/makefile
@@ -5,7 +5,7 @@ SUBDIR=vendor/debian
# Bring in the default rules
include ../../buildlib/defaults.mak
-doc binary: sources.list
+doc binary manpages: sources.list
sources.list: sources.list.in ../../doc/apt-verbatim.ent
sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@
diff --git a/vendor/makefile b/vendor/makefile
index a6d53abd0..c05b516ef 100644
--- a/vendor/makefile
+++ b/vendor/makefile
@@ -12,8 +12,9 @@ doc: doc/subdirs
clean: clean/subdirs
veryclean: veryclean/subdirs
dirs: dirs/subdirs
+manpages: manpages/subdirs
-all/subdirs binary/subdirs doc/subdirs dirs/subdirs:
+all/subdirs binary/subdirs doc/subdirs dirs/subdirs manpages/subdirs:
$(MAKE) -C current $(patsubst %/subdirs,%,$@)
clean/subdirs veryclean/subdirs:
diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile
index 88061bde2..c4b35935f 100644
--- a/vendor/ubuntu/makefile
+++ b/vendor/ubuntu/makefile
@@ -5,7 +5,7 @@ SUBDIR=vendor/ubuntu
# Bring in the default rules
include ../../buildlib/defaults.mak
-doc binary: sources.list
+doc binary manpages: sources.list
sources.list: sources.list.in ../../doc/apt-verbatim.ent
sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@