diff options
| -rw-r--r-- | install.mk | 29 | ||||
| -rw-r--r-- | libraries.mk | 10 | ||||
| -rw-r--r-- | programs.mk | 10 |
3 files changed, 27 insertions, 22 deletions
diff --git a/install.mk b/install.mk index 8211e43e7..e4bc734e1 100644 --- a/install.mk +++ b/install.mk @@ -1,10 +1,11 @@ # Add a rule for creating $(1) as a directory. This template may be # called multiple times for the same directory. define create-dir - ifndef $(1)_SEEN - $(1)_SEEN = 1 - $(1): - $$(trace-mkdir) install -d $(1) + _i := $(DESTDIR)$$(strip $(1)) + ifndef $$(_i)_SEEN + $$(_i)_SEEN = 1 + $$(_i): + $$(trace-mkdir) install -d "$$@" endif endef @@ -13,12 +14,14 @@ endef # The directory containing $(2) will be created automatically. define install-file-as - install: $(2) + _i := $(DESTDIR)$$(strip $(2)) - $$(eval $$(call create-dir,$$(dir $(2)))) + install: $$(_i) - $(2): $(1) | $$(dir $(2)) - $$(trace-install) install -m $(3) $(1) $(2) + $$(_i): $(1) | $$(dir $$(_i)) + $$(trace-install) install -m $(3) $(1) "$$@" + + $$(eval $$(call create-dir, $$(dir $(2)))) endef @@ -43,12 +46,14 @@ endef # Install a symlink from $(2) to $(1). Note that $(1) need not exist. define install-symlink - install: $(2) + _i := $(DESTDIR)$$(strip $(2)) + + install: $$(_i) - $$(eval $$(call create-dir,$$(dir $(2)))) + $$(_i): | $$(dir $$(_i)) + $$(trace-install) ln -sfn $(1) "$$@" - $(2): | $$(dir $(2)) - $$(trace-install) ln -sfn $(1) $(2) + $$(eval $$(call create-dir, $$(dir $(2)))) endef diff --git a/libraries.mk b/libraries.mk index e1c694cb3..c41694794 100644 --- a/libraries.mk +++ b/libraries.mk @@ -50,7 +50,7 @@ define build-library $(1)_LDFLAGS_USE := $(1)_LDFLAGS_USE_INSTALLED := - $$(eval $$(call create-dir,$$(_d))) + $$(eval $$(call create-dir, $$(_d))) ifeq ($(BUILD_SHARED_LIBS), 1) @@ -71,16 +71,16 @@ define build-library $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).$(SO_EXT) + $(1)_INSTALL_PATH := $(DESTDIR)$$($(1)_INSTALL_DIR)/$$($(1)_NAME).$(SO_EXT) _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR))) - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR) $$(trace-ld) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) - $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) ifdef $(1)_FORCE_INSTALL install: $$($(1)_INSTALL_PATH) diff --git a/programs.mk b/programs.mk index 218fd37a3..ab04ff93e 100644 --- a/programs.mk +++ b/programs.mk @@ -22,7 +22,7 @@ define build-program _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) $(1)_PATH := $$(_d)/$(1) - $$(eval $$(call create-dir,$$(_d))) + $$(eval $$(call create-dir, $$(_d))) $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d) $$(trace-ld) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) @@ -30,20 +30,20 @@ define build-program $(1)_INSTALL_DIR ?= $$(bindir) $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) - $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR))) - install: $$($(1)_INSTALL_PATH) + install: $(DESTDIR)$$($(1)_INSTALL_PATH) ifeq ($(BUILD_SHARED_LIBS), 1) _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR) $$(trace-ld) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) else - $$($(1)_INSTALL_PATH): $$($(1)_PATH) | $$($(1)_INSTALL_DIR) + $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_PATH) | $(DESTDIR)$$($(1)_INSTALL_DIR) install -t $$($(1)_INSTALL_DIR) $$< endif |