diff options
| author | bors <bors@rust-lang.org> | 2015-01-04 14:21:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-04 14:21:08 +0000 |
| commit | 5e21e17d9638d14af41e27e5ca9a21c8a1bc0170 (patch) | |
| tree | 0e3249bfafb1caa1638d69778b9139194ca00d9e | |
| parent | 856b90c400b0a3f5e8018255c7e33d3c1ae84a10 (diff) | |
| parent | f2ee9fca851c5a567480147916a2538530433655 (diff) | |
| download | rust-5e21e17d9638d14af41e27e5ca9a21c8a1bc0170.tar.gz rust-5e21e17d9638d14af41e27e5ca9a21c8a1bc0170.zip | |
auto merge of #20437 : ranma42/rust/fix-make-install, r=alexcrichton
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 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 |