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 aeba3e7eb7e8e0b1fe984f63ef1d537822ec1ea2..76f36cd3608b290707a7ad4c4e20d93951a6724c 100644 (file)
--- 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) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
        $(MAKE) -C templates install

-
-install-tools:

        $(MAKE) -C tools install
 
 install-doc:
        $(MAKE) -C tools install
 
 install-doc:

diff --git a/debian/rules b/debian/rules
index 921aeecfb44c9ef55e4755adea6265a74193bcb0..e81ed05bb8f14ac5625c075cad3b473b9fc26cf0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,8 @@ install: build
        dh_clean -k 
        dh_installdirs 
 
        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) ';'
 
        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 8f079dbb59c84c3023b2fad26c8cd38066afd35b..5f7f4b92d11473b735c05fd3724f8d765a61b47e 100644 (file)
--- 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
 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT