mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More robust install.sh: do runnability test in fresh subdirectory.

Browse source 
Fix #15558.
This commit is contained in:
Felix S. Klock II 2014-07-10 19:18:46 +02:00
parent a1bd5d359b
commit 59ab65b2d9
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mk/install.mk
View file

@ -14,16 +14,18 @@ else
MAYBE_DISABLE_VERIFY= MAYBE_DISABLE_VERIFY=
endif endif
install: dist-install-dir-$(CFG_BUILD)-with-target-libs install: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" $(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 # Remove tmp files while we can because they may have been created under sudo
$(Q)rm -R tmp/dist $(Q)rm -R tmp/dist
uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" $(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 # Remove tmp files while we can because they may have been created under sudo
$(Q)rm -R tmp/dist $(Q)rm -R tmp/dist
tmp/empty_dir:
mkdir -p $@
###################################################################### ######################################################################
# Android remote installation # Android remote installation