From f29eaed12fc07bc5b2e4d1a302136a26ff4488ce Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 6 Aug 2005 22:29:21 -0700 Subject: [PATCH] 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 --- Makefile | 10 +++++----- debian/rules | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ecc227754..c01327c1c 100644 --- a/Makefile +++ b/Makefile @@ -234,16 +234,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 diff --git a/debian/rules b/debian/rules index 1409b8b28..2c575ffa1 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,7 @@ install: build 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) ';' -- 2.26.2