summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-11-16 11:27:11 +0000
committerColin Watson <cjwatson@debian.org>2018-11-16 11:27:11 +0000
commita68754e70ab32d6ec0053fd50a5b135259f5f9ac (patch)
tree991e1be8f30225683395dd2e9c828bd3a7e12ec9
parent857ee5cbe73fcd5fccc9d06aa4c0307f523ce57c (diff)
Use dpkg_vendor_derives_from again
This time with syntax that works.
-rwxr-xr-xdebian/rules2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules
index 94d84fd04..94990e023 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ endif
35# Change the version string to reflect distribution 35# Change the version string to reflect distribution
36SSH_EXTRAVERSION := $(DEB_VENDOR)-$(shell echo '$(DEB_VERSION)' | sed -e 's/.*-//') 36SSH_EXTRAVERSION := $(DEB_VENDOR)-$(shell echo '$(DEB_VERSION)' | sed -e 's/.*-//')
37 37
38UBUNTU := $(shell dpkg-vendor --derives-from Ubuntu && echo yes || echo no) 38UBUNTU := $(shell $(call dpkg_vendor_derives_from,Ubuntu))
39ifeq ($(UBUNTU),yes) 39ifeq ($(UBUNTU),yes)
40DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games 40DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
41else 41else