From eef71f11a5836eb82df133cb4e24cb4806642188 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Nov 2013 14:01:28 +0100 Subject: introduce a vendor system to change sources.list Many derivatives make quiet a few simple changes to apt introducing silly diffs just to change examples and co making it harder for them to update apt and harder for us to merge real changes back. First stop: doc/examples/sources.list --- vendor/makefile | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 vendor/makefile (limited to 'vendor/makefile') diff --git a/vendor/makefile b/vendor/makefile new file mode 100644 index 000000000..a6d53abd0 --- /dev/null +++ b/vendor/makefile @@ -0,0 +1,42 @@ +# -*- make -*- +BASE=.. +SUBDIR=vendor + +# Bring in the default rules +include ../buildlib/defaults.mak + +all headers library binary program doc manpages debiandoc test update-po startup dirs: current +all: all/subdirs +binary: binary/subdirs +doc: doc/subdirs +clean: clean/subdirs +veryclean: veryclean/subdirs +dirs: dirs/subdirs + +all/subdirs binary/subdirs doc/subdirs dirs/subdirs: + $(MAKE) -C current $(patsubst %/subdirs,%,$@) + +clean/subdirs veryclean/subdirs: + test ! -e current || $(MAKE) -C current $(patsubst %/subdirs,%,$@) + +current: + rm -f $@ + # search for an exact match to use the correct sources.list example + find -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | while read DISTRO; do \ + if dpkg-vendor --is $$DISTRO; then \ + ln -s $$DISTRO $@; \ + break; \ + fi; \ + done + # if we haven't found a specific, look for a deriving in hardcoded order + test -e $@ || \ + (dpkg-vendor --derives-from ubuntu && cp ln -s ubuntu $@ ) || \ + ln -s debian $@ + +.PHONY: clean veryclean all binary vendor + +clean: clean/current + +clean/current: + test ! -e current || $(MAKE) -C current clean + rm -f current -- cgit v1.2.3-70-g09d2 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 --- doc/makefile | 2 +- vendor/debian/makefile | 2 +- vendor/makefile | 3 ++- vendor/ubuntu/makefile | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'vendor/makefile') diff --git a/doc/makefile b/doc/makefile index 49f3e1b56..4b63e542f 100644 --- a/doc/makefile +++ b/doc/makefile @@ -28,7 +28,7 @@ include $(COPY_H) clean: clean/subdirs clean/examples veryclean: veryclean/subdirs clean/examples -manpages: manpages/subdirs apt-vendor.ent +manpages: apt-vendor.ent manpages/subdirs debiandoc: debiandoc/subdirs DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) 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-70-g09d2