callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes two minor issues when builddir != srcdir

Browse Source
This commit is contained in:
Massimo Valentini
2011-05-26 19:49:17 +02:00
parent 71bedb0ccd
commit ddf09b3a36
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -43,7 +43,7 @@ pkgconfig_DATA = \
AUTHORS: authors.xml authors.xsl AUTHORS: authors.xml authors.xsl
if HAVE_XSLTPROC if HAVE_XSLTPROC
$(XSLTPROC) -o $(@) authors.xsl $< || rm -f $(@) $(XSLTPROC) -o $(@) $(top_srcdir)/authors.xsl $< || rm -f $(@)
endif endif

4
app/Makefile.am
View File

@ -271,8 +271,8 @@ dist-hook: dist-check-gimp-console dist-dump-gimprc
# in which case the git-version.h we ship is correct. # in which case the git-version.h we ship is correct.
git-version.h: update-git-version-header git-version.h: update-git-version-header
@if test -d "$(top_srcdir)/.git"; then \ @if test -d "$(top_srcdir)/.git"; then \
git_version="`git describe`"; \ git_version="`git --git-dir=$(top_srcdir)/.git describe`"; \
git_last_commit_timestamp="`git log -n1 --reverse --pretty=%ct`"; \ git_last_commit_timestamp="`git --git-dir=$(top_srcdir)/.git log -n1 --reverse --pretty=%ct`"; \
git_last_commit_year="`date --utc -d \"1970-01-01 + $$git_last_commit_timestamp seconds\" '+%Y'`"; \ git_last_commit_year="`date --utc -d \"1970-01-01 + $$git_last_commit_timestamp seconds\" '+%Y'`"; \
elif test ! -f "$@"; then \ elif test ! -f "$@"; then \
git_version="Unknown, shouldn't happen"; \ git_version="Unknown, shouldn't happen"; \