From db960871fd56176dcf6d6bb5f09b31c8dad8eed8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Aug 2012 16:02:41 -0400 Subject: use a stamp file to avoid running ghc in make install That fails when make install is run sudoed, but cabal has been used to install dependencies in a user's home directory. --- Makefile | 7 ++++--- doc/bugs/make_install_can__39__t_be_used_with_sudo.mdwn | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9997ed3a0..4dc28e929 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,8 @@ ifdef VIM all=fast endif -all: $(all) +build: $(all) + touch build-stamp sources: $(sources) @@ -74,7 +75,7 @@ install-docs: docs install-mans rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \ fi -install: all install-docs +install: build-stamp install-docs install -d $(DESTDIR)$(PREFIX)/bin install $(bins) $(DESTDIR)$(PREFIX)/bin ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell @@ -115,7 +116,7 @@ docs: $(mans) clean: rm -rf tmp $(bins) $(mans) test configure *.tix .hpc $(sources) \ - doc/.ikiwiki html dist $(clibs) + doc/.ikiwiki html dist $(clibs) build-stamp sdist: clean $(mans) ./make-sdist.sh diff --git a/doc/bugs/make_install_can__39__t_be_used_with_sudo.mdwn b/doc/bugs/make_install_can__39__t_be_used_with_sudo.mdwn index 6cb136586..c43075e58 100644 --- a/doc/bugs/make_install_can__39__t_be_used_with_sudo.mdwn +++ b/doc/bugs/make_install_can__39__t_be_used_with_sudo.mdwn @@ -16,3 +16,5 @@ One would expect git-annex to be installed in the configured prefix. Unfortunate make: *** [git-annex] Error 1 Removing "all" from the dependencies of "install" allows the process to run to completion, although this is clearly not a satisfactory solution. + +> [[fixed|done]] using an ugly stamp file. --[[Joey]] -- cgit v1.2.3