bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #13174 : brson/rust/dist, r=alexcrichton,huonw

Browse source
This commit is contained in:
bors 2014-03-27 21:21:56 -07:00
commit 22a04ce286
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mk/install.mk
View file

@ -12,7 +12,7 @@
install: dist-install-dir-$(CFG_BUILD) install: dist-install-dir-$(CFG_BUILD)
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)" $(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)"
# Remove tmp files while we can because they may have been created under sudo # Remove tmp files while we can because they may have been created under sudo
$(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD/ $(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD)
uninstall: dist-install-dir-$(CFG_BUILD) uninstall: dist-install-dir-$(CFG_BUILD)
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)" $(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)"

1
mk/rt.mk
View file

@ -215,6 +215,7 @@ $$(LIBUV_DIR_$(1))/Release/libuv.a: $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) \
BUILDTYPE=Release \ BUILDTYPE=Release \
NO_LOAD="$$(LIBUV_NO_LOAD)" \ NO_LOAD="$$(LIBUV_NO_LOAD)" \
V=$$(VERBOSE) V=$$(VERBOSE)
$$(Q)touch $$@
endif endif