diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-12 10:37:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-12 10:38:24 -0700 |
| commit | 704a66f52edbc0cc88dca3b0993a072ae49d0f39 (patch) | |
| tree | f058791f3a82d9c564bceffe49e07c37e6347922 | |
| parent | 3e386508f87278610d1892aaaa08cd17907f71c5 (diff) | |
| download | git-704a66f52edbc0cc88dca3b0993a072ae49d0f39.tar.gz | |
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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | git-core.spec.in | 2 |
3 files changed, 3 insertions, 4 deletions
@@ -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 921aeecfb4..e81ed05bb8 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 8f079dbb59..5f7f4b92d1 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 |