diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-11-01 20:23:22 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-11-01 20:23:22 -0700 |
| commit | 758af60334c21ed553148180779063fddfbbc50d (patch) | |
| tree | 57d285c0b4fe38a695d7593320ff2b57c8fbf0d7 | |
| parent | 8ea2123055dcbc1caa0bb07bc492516027b832b4 (diff) | |
Fix installation with DESTDIR
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | mk/install.mk | 18 |
2 files changed, 9 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index b4730a7952f..14176162d9e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -677,12 +677,6 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),) endif ifneq ($(findstring install,$(MAKECMDGOALS)),) - ifdef DESTDIR - CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR)/$(CFG_PREFIX)) - CFG_PREFIX:=$(DESTDIR)/$(CFG_PREFIX) - export CFG_PREFIX - endif - CFG_INFO := $(info cfg: including install rules) include $(CFG_SRC_DIR)mk/install.mk endif diff --git a/mk/install.mk b/mk/install.mk index e48afc18e62..54c01732cba 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -18,24 +18,24 @@ # $(2) is the destination directory # $(3) is the filename/libname-glob ifdef VERBOSE - INSTALL = install -m755 $(1)/$(3) $(2)/$(3) + INSTALL = install -m755 $(1)/$(3) $(DESTDIR)$(2)/$(3) else - INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3) + INSTALL = $(Q)$(call E, install: $(DESTDIR)$(2)/$(3)) && install -m755 $(1)/$(3) $(DESTDIR)$(2)/$(3) endif # For MK_INSTALL_DIR # $(1) is the directory to create -MK_INSTALL_DIR = (umask 022 && mkdir -p $(1)) +MK_INSTALL_DIR = (umask 022 && mkdir -p $(DESTDIR)$(1)) # For INSTALL_LIB, # Target-specific $(LIB_SOURCE_DIR) is the source directory # Target-specific $(LIB_DESTIN_DIR) is the destination directory # $(1) is the filename/libname-glob ifdef VERBOSE - DO_INSTALL_LIB = install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(LIB_DESTIN_DIR)/ + DO_INSTALL_LIB = install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(DESTDIR)$(LIB_DESTIN_DIR)/ else - DO_INSTALL_LIB = $(Q)$(call E, install_lib: $(LIB_DESTIN_DIR)/$(1)) && \ - install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(LIB_DESTIN_DIR)/ + DO_INSTALL_LIB = $(Q)$(call E, install_lib: $(DESTDIR)$(LIB_DESTIN_DIR)/$(1)) && \ + install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(DESTDIR)$(LIB_DESTIN_DIR)/ endif # Target-specific $(LIB_SOURCE_DIR) is the source directory @@ -152,9 +152,9 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_)) $(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD))) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD))) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD))) - $(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR)/man1,rustc.1) - $(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR)/man1,rustdoc.1) - $(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR)/man1,rustpkg.1) + $(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustc.1) + $(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustdoc.1) + $(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustpkg.1) install-targets: $(INSTALL_TARGET_RULES) |