bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #20380: dcrewi/fix-make-install

Browse source 
There seems to be a problem introduced by
8b3c67690c that causes "make install"
to fail when the build is not configured to skip doc building.
This commit is contained in:
Alex Crichton 2015-01-02 09:22:22 -08:00
commit 3cf1992c99
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mk/install.mk
View file

@ -28,7 +28,11 @@ endif
# Remove tmp files because it's a decent amount of disk space # Remove tmp files because it's a decent amount of disk space
$(Q)rm -R tmp/dist $(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 prepare_install: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir
endif
uninstall: uninstall:
ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER))) ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))