mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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>
This commit is contained in:
parent
3e386508f8
commit
704a66f52e
2
Makefile
2
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:
|
||||
|
|
3
debian/rules
vendored
3
debian/rules
vendored
|
@ -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) ';'
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue