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.
This commit is contained in:
parent
0b495e3b81
commit
db960871fd
2 changed files with 6 additions and 3 deletions
7
Makefile
7
Makefile
|
@ -38,7 +38,8 @@ ifdef VIM
|
||||||
all=fast
|
all=fast
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all: $(all)
|
build: $(all)
|
||||||
|
touch build-stamp
|
||||||
|
|
||||||
sources: $(sources)
|
sources: $(sources)
|
||||||
|
|
||||||
|
@ -74,7 +75,7 @@ install-docs: docs install-mans
|
||||||
rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \
|
rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
install: all install-docs
|
install: build-stamp install-docs
|
||||||
install -d $(DESTDIR)$(PREFIX)/bin
|
install -d $(DESTDIR)$(PREFIX)/bin
|
||||||
install $(bins) $(DESTDIR)$(PREFIX)/bin
|
install $(bins) $(DESTDIR)$(PREFIX)/bin
|
||||||
ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell
|
ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell
|
||||||
|
@ -115,7 +116,7 @@ docs: $(mans)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf tmp $(bins) $(mans) test configure *.tix .hpc $(sources) \
|
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)
|
sdist: clean $(mans)
|
||||||
./make-sdist.sh
|
./make-sdist.sh
|
||||||
|
|
|
@ -16,3 +16,5 @@ One would expect git-annex to be installed in the configured prefix. Unfortunate
|
||||||
make: *** [git-annex] Error 1
|
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.
|
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]]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue