Skip to content

Commit

Permalink
More robust install.sh: do runnability test in fresh subdirectory.
Browse files Browse the repository at this point in the history 
Fix #15558.
  • Loading branch information
@pnkfelix
pnkfelix committed Jul 10, 2014
1 parent a1bd5d3 commit 59ab65b
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions mk/install.mk
View file
Expand Up @@ -14,16 +14,18 @@ else
MAYBE_DISABLE_VERIFY=
endif

install: dist-install-dir-$(CFG_BUILD)-with-target-libs
$(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)"
install: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
$(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
$(Q)rm -R tmp/dist

uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
$(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
$(Q)rm -R tmp/dist

tmp/empty_dir:
mkdir -p $@

######################################################################
# Android remote installation
Expand Down

5 comments on commit 59ab65b

@bors
Copy link
Contributor

@bors bors commented on 59ab65b Jul 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at pnkfelix@59ab65b

@bors
Copy link
Contributor

@bors bors commented on 59ab65b Jul 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging pnkfelix/rust/fsk-fix-15558 = 59ab65b into auto

@bors
Copy link
Contributor

@bors bors commented on 59ab65b Jul 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pnkfelix/rust/fsk-fix-15558 = 59ab65b merged ok, testing candidate = b8059f7

@bors
Copy link
Contributor

@bors bors commented on 59ab65b Jul 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = b8059f7

Please sign in to comment.