From ddf09b3a36adc1e93b27c604cc713d09fdaf741d Mon Sep 17 00:00:00 2001 From: Massimo Valentini Date: Thu, 26 May 2011 19:49:17 +0200 Subject: [PATCH] Fixes two minor issues when builddir != srcdir --- Makefile.am | 2 +- app/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5fd12dcbab..8f33fc9a3e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,7 @@ pkgconfig_DATA = \ AUTHORS: authors.xml authors.xsl if HAVE_XSLTPROC - $(XSLTPROC) -o $(@) authors.xsl $< || rm -f $(@) + $(XSLTPROC) -o $(@) $(top_srcdir)/authors.xsl $< || rm -f $(@) endif diff --git a/app/Makefile.am b/app/Makefile.am index 8b5a4a1f37..6a6648ddc2 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -271,8 +271,8 @@ dist-hook: dist-check-gimp-console dist-dump-gimprc # in which case the git-version.h we ship is correct. git-version.h: update-git-version-header @if test -d "$(top_srcdir)/.git"; then \ - git_version="`git describe`"; \ - git_last_commit_timestamp="`git log -n1 --reverse --pretty=%ct`"; \ + git_version="`git --git-dir=$(top_srcdir)/.git describe`"; \ + 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'`"; \ elif test ! -f "$@"; then \ git_version="Unknown, shouldn't happen"; \