diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
| commit | eccff323a093d91fff379e7c8460d7e5c8db8ad1 (patch) | |
| tree | d539d21c6716af3122edabae91feadccfb3c12ad /vendor/makefile | |
| parent | 2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff) | |
| parent | b7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'vendor/makefile')
| -rw-r--r-- | vendor/makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vendor/makefile b/vendor/makefile index c05b516ef..619c603fb 100644 --- a/vendor/makefile +++ b/vendor/makefile @@ -32,9 +32,11 @@ current: # 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 $@ ) || \ + (dpkg-vendor --derives-from tanglu && cp ln -s tanglu $@ ) || \ ln -s debian $@ .PHONY: clean veryclean all binary vendor +.NOPARALLEL: clean: clean/current |