From 9d2880e651607febe0c65e0b225c73106e123811 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Wed, 20 Apr 2016 14:49:43 -0400
Subject: build system: properly use DESTDIR in conjunction with individual
 variables.

---
 Makefile.in           | 16 ++++++++--------
 sysinfo/os/midipix.mk |  4 ++--
 sysinfo/os/mingw.mk   |  4 ++--
 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)
-- 
cgit v1.2.3