security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Fix to support git worktree.

Browse Source 
* autogen.sh, Makefile.am, doc/Makefile.am: Use -e for testing .git.

--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-01-13 17:22:37 +09:00
parent e2f984b4af
commit 96237b9a63
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -120,7 +120,7 @@ endif
gen_start_date = 2011-12-01T06:00:00 gen_start_date = 2011-12-01T06:00:00
.PHONY: gen-ChangeLog .PHONY: gen-ChangeLog
gen-ChangeLog: gen-ChangeLog:
if test -d $(top_srcdir)/.git; then \ if test -e $(top_srcdir)/.git; then \
(cd $(top_srcdir) && \ (cd $(top_srcdir) && \
$(GITLOG_TO_CHANGELOG) --append-dot --tear-off \ $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
--amend=build-aux/git-log-fix \ --amend=build-aux/git-log-fix \

2
autogen.sh
View File

@ -214,7 +214,7 @@ if [ "$myhost" = "find-version" ]; then
esac esac
beta=no beta=no
if [ -d .git ]; then if [ -e .git ]; then
ingit=yes ingit=yes
tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null) tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
if [ -n "$tmp" ]; then if [ -n "$tmp" ]; then

2
doc/Makefile.am
View File

@ -136,7 +136,7 @@ dist-hook: defsincdate
defsincdate: $(gnupg_TEXINFOS) defsincdate: $(gnupg_TEXINFOS)
: >defsincdate ; \ : >defsincdate ; \
if test -d $(top_srcdir)/.git; then \ if test -e $(top_srcdir)/.git; then \
(cd $(srcdir) && git log -1 --format='%ct' \ (cd $(srcdir) && git log -1 --format='%ct' \
-- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \ -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
fi fi