diff options
| author | midipix <writeonce@midipix.org> | 2016-04-20 14:49:43 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-11-10 23:35:40 -0500 |
| commit | 9d2880e651607febe0c65e0b225c73106e123811 (patch) | |
| tree | 697a047f1b77dd4301cf2c0e385318199e8bc8ff | |
| parent | 7cf9c898ac703cd65eaedf52471e10bb20ed8804 (diff) | |
| download | perk-9d2880e651607febe0c65e0b225c73106e123811.tar.bz2 perk-9d2880e651607febe0c65e0b225c73106e123811.tar.xz | |
build system: properly use DESTDIR in conjunction with individual variables.
| -rw-r--r-- | Makefile.in | 16 | ||||
| -rw-r--r-- | sysinfo/os/midipix.mk | 4 | ||||
| -rw-r--r-- | 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) |