From: Junio C Hamano <junkio@cox.net>
Date: Fri, 12 Aug 2005 17:37:33 +0000 (-0700)
Subject: Make tools/ directory first-class citizen.
X-Git-Tag: v0.99.5~23^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=704a66f52edbc0cc88dca3b0993a072ae49d0f39;p=git.git

Make tools/ directory first-class citizen.

Tools directory being separate is just a historical
coincidence.  Build and install together with the main
directory, just like the clean target does.

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

diff --git a/Makefile b/Makefile
index aeba3e7eb..76f36cd36 100644
--- a/Makefile
+++ b/Makefile
@@ -212,8 +212,6 @@ install: $(PROG) $(SCRIPTS)
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
 	$(MAKE) -C templates install
-
-install-tools:
 	$(MAKE) -C tools install
 
 install-doc:
diff --git a/debian/rules b/debian/rules
index 921aeecfb..e81ed05bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs 
 
-	make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-tools install-doc
+	make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) \
+		install install-doc
 
 	mkdir -p $(DOC_DESTDIR)
 	find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'
diff --git a/git-core.spec.in b/git-core.spec.in
index 8f079dbb5..5f7f4b92d 100644
--- a/git-core.spec.in
+++ b/git-core.spec.in
@@ -29,7 +29,7 @@ make prefix=%{_prefix} all %{!?_without_docs: doc}
 %install
 rm -rf $RPM_BUILD_ROOT
 make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
-     install install-tools %{!?_without_docs: install-doc}
+     install %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT