diff options
| author | midipix <writeonce@midipix.org> | 2016-04-20 18:01:16 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-21 03:07:21 -0400 |
| commit | 2d45c921811e8dbb3833b5a9a68db9d2a4b0cc1c (patch) | |
| tree | 3f79950d1016137eab7a14daac4339a4780d2c58 | |
| parent | 6bc15ae9345a41766264fbd3304d0157ef314c2b (diff) | |
| download | ntcon-2d45c921811e8dbb3833b5a9a68db9d2a4b0cc1c.tar.bz2 ntcon-2d45c921811e8dbb3833b5a9a68db9d2a4b0cc1c.tar.xz | |
build system: properly use DESTDIR in conjunction with individual variables.
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | sysinfo/os/midipix.mk | 4 | ||||
| -rw-r--r-- | sysinfo/os/mingw.mk | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 6b10e46..6c0b64f 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 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) |