diff options
| author | midipix <writeonce@midipix.org> | 2016-04-20 17:48:43 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-21 03:04:03 -0400 |
| commit | c646f8c5dff2325fd581c48f5c90920bb375cb88 (patch) | |
| tree | 99909d56867e672336ef1e795fd334faf2265306 | |
| parent | 74af79656c81760bcb27d1795f66529daf41aabe (diff) | |
| download | pemagine-c646f8c5dff2325fd581c48f5c90920bb375cb88.tar.bz2 pemagine-c646f8c5dff2325fd581c48f5c90920bb375cb88.tar.xz | |
build system: properly use DESTDIR in conjunction with individual variables.
| -rw-r--r-- | Makefile.in | 22 | ||||
| -rw-r--r-- | sysinfo/os/midipix.mk | 4 | ||||
| -rw-r--r-- | sysinfo/os/mingw.mk | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index 470c49c..5cb6573 100644 --- a/Makefile.in +++ b/Makefile.in @@ -97,21 +97,21 @@ install: install-libs install-headers install-libs: install-shared install-static install-implib install-headers:shared static - mkdir -p $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE) - mkdir -p $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)/bits - mkdir -p $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)/bits/nt32 - mkdir -p $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)/bits/nt64 - cp $(API_HEADERS) $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE) - cp $(API_HEADERS_NT32) $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)/bits/nt32 - cp $(API_HEADERS_NT64) $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)/bits/nt64 + mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE) + mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits + mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits/nt32 + mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits/nt64 + cp $(API_HEADERS) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE) + cp $(API_HEADERS_NT32) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits/nt32 + cp $(API_HEADERS_NT64) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits/nt64 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 68766d1..4b5a608 100644 --- a/sysinfo/os/midipix.mk +++ b/sysinfo/os/midipix.mk @@ -8,5 +8,5 @@ OS_LIBDEF_EXT = .so.def OS_ARCHIVE_EXT = .a 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 1a66aba..085d1be 100644 --- a/sysinfo/os/mingw.mk +++ b/sysinfo/os/mingw.mk @@ -10,5 +10,5 @@ OS_ARCHIVE_EXT = .a CFLAGS_PIC = install-implib: shared-implib - mkdir -p $(DESTDIR)///./$(PREFIX)/./$(LIBDIR) - cp $(SHARED_IMPLIB) $(DESTDIR)///./$(PREFIX)/./$(LIBDIR) + mkdir -p $(DESTDIR)$(LIBDIR) + cp $(SHARED_IMPLIB) $(DESTDIR)$(LIBDIR) |