diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-20 16:04:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-20 16:04:56 -0400 |
| commit | 68f1be8f0a79bcff595c7aff2289bb95c4d5b590 (patch) | |
| tree | 00d36cf1be1cc795ca46e81950c7fa293f5a5d26 /Makefile | |
| parent | dcd208513d24c609719065c51eb176f6b0df3024 (diff) | |
| parent | 08db0b9fa3cbf49d465479fabfab0c8f1b521b1c (diff) | |
Merge branch 'master' into assistant
Conflicts:
Makefile
debian/copyright
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -41,7 +41,8 @@ ifdef VIM all=fast endif -all: $(all) +build: $(all) + touch build-stamp sources: $(sources) @@ -78,7 +79,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 @@ -120,7 +121,7 @@ docs: $(mans) clean: rm -rf $(GIT_ANNEX_TMP_BUILD_DIR) $(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 |