undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move all dashed-form commands to libexecdir

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2007-11-28 23:21:57 +07:00 committed by Junio C Hamano
parent e449f10580
commit f28ac70f48
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -174,7 +174,7 @@ prefix = $(HOME)
bindir = $(prefix)/bin bindir = $(prefix)/bin
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
infodir = $(prefix)/share/info infodir = $(prefix)/share/info
gitexecdir = $(bindir) gitexecdir = $(prefix)/libexec/git-core
sharedir = $(prefix)/share sharedir = $(prefix)/share
template_dir = $(sharedir)/git-core/templates template_dir = $(sharedir)/git-core/templates
htmldir=$(sharedir)/doc/git-doc htmldir=$(sharedir)/doc/git-doc
@ -1286,6 +1286,7 @@ endif
ifneq (,$X) ifneq (,$X)
$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';) $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
endif endif
./check_bindir 'z$(bindir_SQ)' 'z$(gitexecdir_SQ)' '$(DESTDIR_SQ)$(bindir_SQ)/git-shell$X'
install-doc: install-doc:
$(MAKE) -C Documentation install $(MAKE) -C Documentation install

13
check_bindir Executable file
View File

@ -0,0 +1,13 @@
#!/bin/sh
bindir="$1"
gitexecdir="$2"
gitcmd="$3"
if test "$bindir" != "$gitexecdir" -a -x "$gitcmd"
then
echo
echo "!! You have installed git-* commands to new gitexecdir."
echo "!! Old version git-* commands still remain in bindir."
echo "!! Mixing two versions of Git will lead to problems."
echo "!! Please remove old version commands in bindir now."
echo
fi

2
config.mak.in
View File

@ -11,7 +11,7 @@ TCLTK_PATH = @TCLTK_PATH@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
#gitexecdir = @libexecdir@/git-core/ gitexecdir = @libexecdir@/git-core/
datarootdir = @datarootdir@ datarootdir = @datarootdir@
template_dir = @datadir@/git-core/templates/ template_dir = @datadir@/git-core/templates/

13
git.spec.in
View File

@ -117,6 +117,7 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{_libexecdir}/git-core -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files
(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
%if %{!?_without_docs:1}0 %if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
@ -136,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
%files svn %files svn
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/*svn* %{_libexecdir}/git-core/*svn*
%doc Documentation/*svn*.txt %doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*} %{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html } %{!?_without_docs: %doc Documentation/*svn*.html }
@ -144,28 +145,28 @@ rm -rf $RPM_BUILD_ROOT
%files cvs %files cvs
%defattr(-,root,root) %defattr(-,root,root)
%doc Documentation/*git-cvs*.txt %doc Documentation/*git-cvs*.txt
%{_bindir}/*cvs* %{_libexecdir}/git-core/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html } %{!?_without_docs: %doc Documentation/*git-cvs*.html }
%files arch %files arch
%defattr(-,root,root) %defattr(-,root,root)
%doc Documentation/git-archimport.txt %doc Documentation/git-archimport.txt
%{_bindir}/git-archimport %{_libexecdir}/git-core/git-archimport
%{!?_without_docs: %{_mandir}/man1/git-archimport.1*} %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
%{!?_without_docs: %doc Documentation/git-archimport.html } %{!?_without_docs: %doc Documentation/git-archimport.html }
%files email %files email
%defattr(-,root,root) %defattr(-,root,root)
%doc Documentation/*email*.txt %doc Documentation/*email*.txt
%{_bindir}/*email* %{_libexecdir}/git-core/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html } %{!?_without_docs: %doc Documentation/*email*.html }
%files gui %files gui
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/git-gui %{_libexecdir}/git-core/git-gui
%{_bindir}/git-citool %{_libexecdir}/git-core/git-citool
%{_datadir}/git-gui/ %{_datadir}/git-gui/
%{!?_without_docs: %{_mandir}/man1/git-gui.1*} %{!?_without_docs: %{_mandir}/man1/git-gui.1*}
%{!?_without_docs: %doc Documentation/git-gui.html} %{!?_without_docs: %doc Documentation/git-gui.html}