Merge with master.

diff --git a/Makefile b/Makefile
index ecc2277540194cc06762892680d96568a4db9af1..e574f44faf4003664596fbef2ff7859b5e10865b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -174,6 +174,7 @@ init-db.o: init-db.c
        $(CC) -c $(CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
 
 $(LIB_OBJS): $(LIB_H)
+$(patsubst git-%,%.o,$(PROG)): $(LIB_H)
 $(DIFF_OBJS): diffcore.h
 
 $(LIB_FILE): $(LIB_OBJS)
@@ -234,16 +235,16 @@ rpm: dist
        $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
 
 deb: dist
-       rm -rf git-core-$(GIT_VERSION)
-       tar zxf git-core-$(GIT_VERSION).tar.gz
-       cd git-core-$(GIT_VERSION) && fakeroot debian/rules binary
+       rm -rf $(GIT_TARNAME)
+       tar zxf $(GIT_TARNAME).tar.gz
+       cd $(GIT_TARNAME) && fakeroot debian/rules binary
 
 ### Cleaning rules
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
-       rm -f git-core-*.tar.gz git-core.spec git-core-$(GIT_VERSION)-*.deb
-       rm -rf git-core-$(GIT_VERSION)
+       rm -f $(GIT_TARNAME).tar.gz git-core.spec git-core_$(GIT_VERSION)-*.deb
+       rm -rf $(GIT_TARNAME)
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean
        $(MAKE) -C templates/ clean