From 1a16d0fe7fa1b0013c66ced7ce12edf5e777f898 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 15 Mar 2020 04:20:00 -0500 Subject: [PATCH] Do not add slash between between DESTDIR and PREFIX in makefile --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e8c5e6d..8eed9c9 100644 --- a/Makefile +++ b/Makefile @@ -34,9 +34,8 @@ OBJS=src/webdis.o src/cmd.o src/worker.o src/slog.o src/server.o src/acl.o src/m PREFIX ?= /usr/local CONFDIR ?= $(DESTDIR)/etc -INSTALL_DIRS = $(DESTDIR) \ - $(DESTDIR)/$(PREFIX) \ - $(DESTDIR)/$(PREFIX)/bin \ +INSTALL_DIRS = $(DESTDIR)$(PREFIX) \ + $(DESTDIR)$(PREFIX)/bin \ $(CONFDIR) all: $(OUT) Makefile @@ -57,7 +56,7 @@ clean: rm -f $(OBJS) $(OUT) $(OBJS_DEPS) install: $(OUT) $(INSTALL_DIRS) - cp $(OUT) $(DESTDIR)/$(PREFIX)/bin + cp $(OUT) $(DESTDIR)$(PREFIX)/bin cp webdis.prod.json $(CONFDIR)