summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-20 17:38:26 -0400
committermidipix <writeonce@midipix.org>2016-04-20 17:38:26 -0400
commitae9f084ffb52813b8e46c57cf3f6dd5d329594d5 (patch)
treeb2a81a0a3463f6d8420f63acce61144805119deb
parent7e4a8752b86842b50d715c62fa168962fb29d8be (diff)
downloaddalist-ae9f084ffb52813b8e46c57cf3f6dd5d329594d5.tar.bz2
dalist-ae9f084ffb52813b8e46c57cf3f6dd5d329594d5.tar.xz
build system: properly use DESTDIR in conjunction with individual variables.
-rw-r--r--Makefile.in12
-rw-r--r--sysinfo/os/midipix.mk4
-rw-r--r--sysinfo/os/mingw.mk4
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index c18a158..c6b7c2f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,16 +97,16 @@ install: install-libs install-headers
install-libs: install-shared install-static install-implib
install-headers:shared static
- mkdir -p $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)
- cp $(API_HEADERS) $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)
+ mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)
+ cp $(API_HEADERS) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)
install-shared: shared install-implib
- mkdir -p $(DESTDIR)///./$(PREFIX)/./$(LIBDIR)
- cp $(SHARED_LIB) $(DESTDIR)///./$(PREFIX)/./$(LIBDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ cp $(SHARED_LIB) $(DESTDIR)$(LIBDIR)
install-static: static
- mkdir -p $(DESTDIR)///./$(PREFIX)/./$(LIBDIR)
- cp $(STATIC_LIB) $(DESTDIR)///./$(PREFIX)/./$(LIBDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ cp $(STATIC_LIB) $(DESTDIR)$(LIBDIR)
diff --git a/sysinfo/os/midipix.mk b/sysinfo/os/midipix.mk
index 4a92e62..7b7f17a 100644
--- a/sysinfo/os/midipix.mk
+++ b/sysinfo/os/midipix.mk
@@ -10,5 +10,5 @@ OS_ARCHIVE_EXT = .a
LDFLAGS_CONFIG += -mout-implib
install-implib: shared-implib
- mkdir -p $(DESTDIR)///./$(PREFIX)/./$(LIBDIR)
- cp $(SHARED_IMPLIB) $(DESTDIR)///./$(PREFIX)/./$(LIBDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ cp $(SHARED_IMPLIB) $(DESTDIR)$(LIBDIR)
diff --git a/sysinfo/os/mingw.mk b/sysinfo/os/mingw.mk
index b71736b..1b37dd4 100644
--- a/sysinfo/os/mingw.mk
+++ b/sysinfo/os/mingw.mk
@@ -11,5 +11,5 @@ CFLAGS_PIC =
LDFLAGS_CONFIG += -Wl,--out-implib,$(SHARED_IMPLIB)
install-implib: shared-implib
- mkdir -p $(DESTDIR)///./$(PREFIX)/./$(LIBDIR)
- cp $(SHARED_IMPLIB) $(DESTDIR)///./$(PREFIX)/./$(LIBDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ cp $(SHARED_IMPLIB) $(DESTDIR)$(LIBDIR)