提交 704a66f5 编写于 作者: J Junio C Hamano

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: NJunio C Hamano <junkio@cox.net>
上级 3e386508
......@@ -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:
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册