Makefile: eliminate phony/duplicate bup target

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index b129a7e08f1818770d0d213c972bb139498ca80a..9b4678efdbaf2600d9c218b2d74c12fe16684f32 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,8 @@ default: all
 all: bup Documentation/all
        t/configure-sampledata --setup
 
-bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
+bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds main.py
+       ln -sf main.py bup
 
 Documentation/all: bup
 
@@ -120,10 +121,6 @@ test: all
 
 check: test
 
-bup: main.py
-       rm -f $@
-       ln -s $< $@
-
 cmds: \
     $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
     $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
@@ -153,13 +150,13 @@ export-docs: Documentation/all
        rm -f $${GIT_INDEX_FILE} && \
        git add -f Documentation/*.1 && \
        git update-ref refs/heads/man \
-               $$(echo "Autogenerated man pages for $$(git describe)" \
+               $$(echo "Autogenerated man pages for $$(git describe --always)" \
                    | git commit-tree $$(git write-tree --prefix=Documentation) \
                                -p refs/heads/man) && \
        rm -f $${GIT_INDEX_FILE} && \
        git add -f Documentation/*.html && \
        git update-ref refs/heads/html \
-               $$(echo "Autogenerated html pages for $$(git describe)" \
+               $$(echo "Autogenerated html pages for $$(git describe --always)" \
                    | git commit-tree $$(git write-tree --prefix=Documentation) \
                                -p refs/heads/html)