diff options
| author | Colin Watson <cjwatson@debian.org> | 2018-11-15 15:57:15 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2018-11-15 15:57:15 +0000 |
| commit | 857ee5cbe73fcd5fccc9d06aa4c0307f523ce57c (patch) | |
| tree | 46556c5489c830ffa5886fbeaae48705d8b4dc84 /debian/rules | |
| parent | f5b06964c312a13fcb79a3bc0d2a223281a74810 (diff) | |
Fix Ubuntu detection in debian/rules
The documentation comment for dpkg_vendor_derives_from is wrong (thanks,
Jeremy Bicha; see #913816).
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index 24f1683dc..94d84fd04 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 |
| 36 | SSH_EXTRAVERSION := $(DEB_VENDOR)-$(shell echo '$(DEB_VERSION)' | sed -e 's/.*-//') | 36 | SSH_EXTRAVERSION := $(DEB_VENDOR)-$(shell echo '$(DEB_VERSION)' | sed -e 's/.*-//') |
| 37 | 37 | ||
| 38 | UBUNTU := $(call dpkg_vendor_derives_from Ubuntu) | 38 | UBUNTU := $(shell dpkg-vendor --derives-from Ubuntu && echo yes || echo no) |
| 39 | ifeq ($(UBUNTU),yes) | 39 | ifeq ($(UBUNTU),yes) |
| 40 | DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games | 40 | DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games |
| 41 | else | 41 | else |