Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-10-15 18:32:03 -0400
committerLevente Polyak <anthraxx@archlinux.org>2019-08-09 19:40:05 +0200
commitf52002955c9d1c0809fa31d91d398c5a1fdcee0a (patch)
treeb52c9942bba850bf580d7b64e55b01b22c9b826f
parent58374246c4e32d14354345aef516d49207881ce2 (diff)
Makefile: don't inject DESTDIR into the pkgdatadir
In commit 46c4def0733a78ce08702d188e3e1a141fb07316, we added support for nonstandard PREFIX installations, but DESTDIR was and is never supposed to be a part of that. While DESTDIR isn't terribly likely to be used during `make all` invocations, that's no reason to break horribly if it is used for some reason. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 27cd90f..606ed61 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ MANS = \
all: $(BINPROGS) bash_completion zsh_completion man
man: $(MANS)
-edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g"
+edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
%: %.in Makefile lib/common.sh
@echo "GEN $@"