diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2015-01-02 20:33:04 +0100 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2015-01-03 09:49:51 +0100 |
| commit | f2ee9fca851c5a567480147916a2538530433655 (patch) | |
| tree | 58efd5ebbab46f80326116c50147f3d0ec718e62 | |
| parent | fc2ba13939aa9672d886beb06efde7aeda2d5f7f (diff) | |
| download | rust-f2ee9fca851c5a567480147916a2538530433655.tar.gz rust-f2ee9fca851c5a567480147916a2538530433655.zip | |
Fix `make install` dependencies
After 8b3c67690c4747b9fadfef407e6261524fb03f8a the `make install` command fails if docs are not disabled through CFG_DISABLE_DOCS, because now the `install` target uses ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh In 714a2c678c5a5d1fdb9d6de3d515279120305441 the `prepare_install` target wwas changed to conditionally depend also on the doc archive, but did not modify `prepare_uninstall`. Instead of explicitly depending on dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz, the `prepare_[un]install` targets now depend on `dist-tar-bins`, which packages the appropriate dist archives depending on the configuration.
| -rw-r--r-- | mk/install.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mk/install.mk b/mk/install.mk index a8dfdffb59d..60c0a6bb4c7 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -28,11 +28,7 @@ endif # Remove tmp files because it's a decent amount of disk space $(Q)rm -R tmp/dist -ifeq ($(CFG_DISABLE_DOCS),) -prepare_install: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz dist/$(DOC_PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir -else -prepare_install: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir -endif +prepare_install: dist-tar-bins | tmp/empty_dir uninstall: ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER))) @@ -48,7 +44,7 @@ endif # Remove tmp files because it's a decent amount of disk space $(Q)rm -R tmp/dist -prepare_uninstall: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir +prepare_uninstall: dist-tar-bins | tmp/empty_dir .PHONY: install prepare_install uninstall prepare_uninstall |