diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-07-22 17:17:57 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-07-22 17:18:03 -0700 |
| commit | ce20571a55ecc7915eaaa95bfedb67d389d2899c (patch) | |
| tree | d0e0ecd2b6bbfbf68dbb6210b788a3061498b893 | |
| parent | bc6bbc3db16f78dc49e7311a4d0d0668f6cb801e (diff) | |
| download | rust-ce20571a55ecc7915eaaa95bfedb67d389d2899c.tar.gz rust-ce20571a55ecc7915eaaa95bfedb67d389d2899c.zip | |
Revert "Made 'make install' include libs for additional targets"
This reverts commit 87334fb05ff2a665419241d877c13d6c4770a3f4. Conflicts: mk/install.mk
| -rw-r--r-- | mk/dist.mk | 34 | ||||
| -rw-r--r-- | mk/install.mk | 4 |
2 files changed, 15 insertions, 23 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index c73d66a999e..a3d9a5758e4 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -205,17 +205,19 @@ distcheck-osx: dist-osx # Unix binary installer tarballs ###################################################################### -define DEF_PREPARE_DIST_DIR - -dist-install-dir-$(1)$(3): PREPARE_HOST=$(1) -dist-install-dir-$(1)$(3): PREPARE_TARGETS=$(2) -dist-install-dir-$(1)$(3): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1) -dist-install-dir-$(1)$(3): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) -dist-install-dir-$(1)$(3): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) -dist-install-dir-$(1)$(3): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) -dist-install-dir-$(1)$(3): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) -dist-install-dir-$(1)$(3): PREPARE_CLEAN=true -dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs +define DEF_INSTALLER + +$$(eval $$(call DEF_PREPARE,dir-$(1))) + +dist-install-dir-$(1): PREPARE_HOST=$(1) +dist-install-dir-$(1): PREPARE_TARGETS=$(1) +dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1) +dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) +dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) +dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) +dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) +dist-install-dir-$(1): PREPARE_CLEAN=true +dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs $$(Q)(cd $$(PREPARE_DEST_DIR)/ && find . -type f | sed 's/^\.\///') \ > tmp/dist/manifest-$(1).in $$(Q)mv tmp/dist/manifest-$(1).in $$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)/rustlib/manifest.in @@ -227,16 +229,6 @@ dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs $$(Q)cp -r doc $$(PREPARE_DEST_DIR) $$(Q)$$(PREPARE_BIN_CMD) $$(S)src/etc/install.sh $$(PREPARE_DEST_DIR) -endef - -define DEF_INSTALLER - -$$(eval $$(call DEF_PREPARE,dir-$(1))) - -$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(1),)) - -$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(CFG_TARGET),-with-target-libs)) - dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1) @$(call E, build: $$@) $$(Q)tar -czf dist/$$(PKG_NAME)-$(1).tar.gz -C tmp/dist $$(PKG_NAME)-$(1) diff --git a/mk/install.mk b/mk/install.mk index b9baf6e02e1..b7dac6a2e92 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -14,12 +14,12 @@ else MAYBE_DISABLE_VERIFY= endif -install: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir +install: dist-install-dir-$(CFG_BUILD) | tmp/empty_dir $(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" # Remove tmp files while we can because they may have been created under sudo $(Q)rm -R tmp/dist -uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir +uninstall: dist-install-dir-$(CFG_BUILD) | tmp/empty_dir $(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" # Remove tmp files while we can because they may have been created under sudo $(Q)rm -R tmp/dist |