From: Christian Hesse <list@eworm.de>
To: wireguard@lists.zx2c4.com
Cc: Christian Hesse <mail@eworm.de>
Subject: [PATCH 1/1] tools: remove DESTDIR for autodetection
Date: Wed, 4 Jan 2017 21:14:16 +0100 [thread overview]
Message-ID: <20170104201416.25893-1-list@eworm.de> (raw)
In-Reply-To: <CAHmME9qEs=oHr=r=dfAeiL=QGXxOeNmuFUkrnbv7L4MBbHb+tw@mail.gmail.com>
From: Christian Hesse <mail@eworm.de>
DESTDIR is always empty, no need to check anything there. Check the main
system instead.
Signed-off-by: Christian Hesse <mail@eworm.de>
---
src/tools/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tools/Makefile b/src/tools/Makefile
index fe483b9..8160cc9 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -12,12 +12,12 @@ WITH_WGQUICK ?=
WITH_SYSTEMDUNITS ?=
ifeq ($(WITH_BASHCOMPLETION),)
-ifneq ($(strip $(wildcard $(DESTDIR)$(BASHCOMPDIR))),)
+ifneq ($(strip $(wildcard $(BASHCOMPDIR))),)
WITH_BASHCOMPLETION := yes
endif
endif
ifeq ($(WITH_WGQUICK),)
-ifneq ($(strip $(wildcard $(DESTDIR)$(BINDIR)/bash)),)
+ifneq ($(strip $(wildcard $(BINDIR)/bash)),)
WITH_WGQUICK := yes
endif
ifneq ($(strip $(wildcard $(DESTDIR)/bin/bash)),)
@@ -25,7 +25,7 @@ WITH_WGQUICK := yes
endif
endif
ifeq ($(WITH_SYSTEMDUNITS),)
-ifneq ($(strip $(wildcard $(DESTDIR)$(SYSTEMDUNITDIR))),)
+ifneq ($(strip $(wildcard $(SYSTEMDUNITDIR))),)
WITH_SYSTEMDUNITS := yes
endif
endif
--
2.11.0
next prev parent reply other threads:[~2017-01-04 20:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-04 18:50 distro packaging, makefiles, deps, systemd, new tools Jason A. Donenfeld
2017-01-04 20:14 ` Christian Hesse [this message]
2017-01-04 20:26 ` [PATCH 1/1] tools: remove DESTDIR for autodetection Jason A. Donenfeld
2017-01-04 21:02 ` Daniel Kahn Gillmor
2017-01-04 21:06 ` Jason A. Donenfeld
2017-01-04 21:18 ` Jason A. Donenfeld
2017-01-04 21:16 ` distro packaging, makefiles, deps, systemd, new tools Daniel Kahn Gillmor
2017-01-05 14:02 ` Dan Lüdtke
2017-01-06 23:01 ` Jason A. Donenfeld
2017-01-11 16:46 ` Dan Lüdtke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170104201416.25893-1-list@eworm.de \
--to=list@eworm.de \
--cc=mail@eworm.de \
--cc=wireguard@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).