Fix build rules for debian package.

Run install-tools target to install the tools to accept e-mail
patches.  Also clean up the main Makefile a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index ecc2277540194cc06762892680d96568a4db9af1..c01327c1c623950f8b9f83d913ef6d7aa136ced0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -234,16 +234,16 @@ rpm: dist
        $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
 
 deb: 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)
 
 ### 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
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean
        $(MAKE) -C templates/ clean

diff --git a/debian/rules b/debian/rules
index 1409b8b280f9d9ea7c8af34b462c4e2358ab3b2e..2c575ffa1929f392df751f991c561c623f5a06f2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ install: build
        dh_clean -k 
        dh_installdirs 
 
        dh_clean -k 
        dh_installdirs 
 

-       make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-doc
+       make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-tools install-doc

 
        mkdir -p $(DOC_DESTDIR)
        find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'
 
        mkdir -p $(DOC_DESTDIR)
        find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'