diff options
| author | midipix <writeonce@midipix.org> | 2016-04-20 17:56:46 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-21 03:06:02 -0400 |
| commit | 73851625931a79c88fd549a5f8207685945970b9 (patch) | |
| tree | c5401cfa58ecfedec77be03a08e248ad92ea125a | |
| parent | defe80ad2da4697f293c6b9188a45af3676a708b (diff) | |
| download | ntapi-73851625931a79c88fd549a5f8207685945970b9.tar.bz2 ntapi-73851625931a79c88fd549a5f8207685945970b9.tar.xz | |
build system: properly use DESTDIR in conjunction with individual variables.
| -rw-r--r-- | Makefile.in | 24 | ||||
| -rw-r--r-- | sysinfo/os/midipix.mk | 4 | ||||
| -rw-r--r-- | sysinfo/os/mingw.mk | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index f878ab7..cafa127 100644 --- a/Makefile.in +++ b/Makefile.in @@ -97,22 +97,22 @@ 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/i386 - mkdir -p $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)/bits/x86_64 - cp $(API_HEADERS) $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE) - cp $(API_HEADERS_BITS) $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)/bits - cp $(API_HEADERS_I386) $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)/bits/i386 - cp $(API_HEADERS_X86_64) $(DESTDIR)///./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)/bits/x86_64 + mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE) + mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits + mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits/i386 + mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits/x86_64 + cp $(API_HEADERS) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE) + cp $(API_HEADERS_BITS) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits + cp $(API_HEADERS_I386) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits/i386 + cp $(API_HEADERS_X86_64) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits/x86_64 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) |