From 7d4e304565877daae2b7dbea6759670358de0d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= Date: Mon, 15 Jul 2019 19:09:49 +0300 Subject: [PATCH] Handle DESTDIR correctly --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ce02cbb..a0d9e27 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ DESTDIR ?= PREFIX ?= /usr/local EXEC_PREFIX ?= $(PREFIX) -BINDIR ?= $(DESTDIR)$(EXEC_PREFIX)/bin -LIBEXECDIR ?= $(DESTDIR)$(EXEC_PREFIX)/libexec +BINDIR ?= $(EXEC_PREFIX)/bin +LIBEXECDIR ?= $(EXEC_PREFIX)/libexec CFLAGS += -Os -g -Wall -Wextra -pedantic CPPFLAGS += @@ -38,14 +38,14 @@ ethermess-backend: ethermess-backend.o $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< install: $(BINS) $(LIBEXECS) - mkdir -p $(BINDIR) - mkdir -p $(LIBEXECDIR) - install $(BINS) $(BINDIR) - install $(LIBEXECS) $(LIBEXECDIR) + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(LIBEXECDIR) + install $(BINS) $(DESTDIR)$(BINDIR) + install $(LIBEXECS) $(DESTDIR)$(LIBEXECDIR) uninstall: - cd $(BINDIR) && rm $(BINS) - cs $(LIBEXECDIR) && rm $(LIBEXECS) + cd $(DESTDIR)$(BINDIR) && rm $(BINS) + cs $(DESTDIR)$(LIBEXECDIR) && rm $(LIBEXECS) clean: rm -f $(BINS) $(LIBEXECS) *.o