From 6f3c4e3300d8a213ce438d03c8de4196c4be960a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Dec 2013 08:00:43 +0100 Subject: vendor/makefile: fix build error for parallel builds --- vendor/ubuntu/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor') diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile index ea67e6e63..88061bde2 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: sources.list +doc binary: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ -- cgit v1.2.3 From 7d15eeef6e61d9a02efcad2dc704f22df4276d9b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Dec 2013 13:22:00 +0100 Subject: vendor/debian/makefile: apply 6f3c4e33 for debian/makefile as well --- vendor/debian/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor') diff --git a/vendor/debian/makefile b/vendor/debian/makefile index dd35a70f0..42c86e1c4 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: sources.list +doc binary: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ -- cgit v1.2.3 From 5cc8cbf368251c4be4ffa1482fa5fb6b9d950452 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Dec 2013 17:29:50 +0100 Subject: fix build failure with the new apt-vendors stuff --- vendor/debian/makefile | 2 +- vendor/makefile | 3 ++- vendor/ubuntu/makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'vendor') 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' $< > $@ -- cgit v1.2.3