summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-20 14:49:43 -0400
committermidipix <writeonce@midipix.org>2016-04-20 17:33:20 -0400
commitd4de3398a3d13b68bc1565815a71cb4bc4b1b088 (patch)
tree44373e114ab9cc77c10e26d983324600a75ddf6f
parent1b0fc64c29caead0ea3e01d9accccb13c4874bd3 (diff)
downloadsofort-d4de3398a3d13b68bc1565815a71cb4bc4b1b088.tar.bz2
sofort-d4de3398a3d13b68bc1565815a71cb4bc4b1b088.tar.xz
build system: properly use DESTDIR in conjunction with individual variables.
-rw-r--r--Makefile.in16
-rw-r--r--sysinfo/os/midipix.mk4
-rw-r--r--sysinfo/os/mingw.mk4
3 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in
index e928404..37216a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,20 +104,20 @@ app: default-app
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)
install-app: app
- mkdir -p $(DESTDIR)///./$(PREFIX)/./$(BINDIR)
- cp $(APP) $(DESTDIR)///./$(PREFIX)/./$(BINDIR)
+ mkdir -p $(DESTDIR)$(BINDIR)
+ cp $(APP) $(DESTDIR)$(BINDIR)
diff --git a/sysinfo/os/midipix.mk b/sysinfo/os/midipix.mk
index 715dbcd..d1cc534 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 6fbc76d..be3c106 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)