[svn] GnuPG - r5209 - branches/STABLE-BRANCH-2-0/common

[svn author wk]

Author: wk
Date: 2009-12-04 12:38:41 +0100 (Fri, 04 Dec 2009)
New Revision: 5209

Modified:
   branches/STABLE-BRANCH-2-0/common/ChangeLog
   branches/STABLE-BRANCH-2-0/common/Makefile.am
Log:
Fix for bug 1164


Modified: branches/STABLE-BRANCH-2-0/common/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/common/ChangeLog	2009-12-04 11:37:12 UTC (rev 5208)
+++ branches/STABLE-BRANCH-2-0/common/ChangeLog	2009-12-04 11:38:41 UTC (rev 5209)
@@ -1,3 +1,8 @@
+2009-12-04  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (audit-events.h, status-codes.h): Create files in
+	the source dir.  Fixes bug#1164.
+
 2009-12-03  Werner Koch  <wk at g10code.com>
 
 	From trunk:

Modified: branches/STABLE-BRANCH-2-0/common/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-2-0/common/Makefile.am	2009-12-04 11:37:12 UTC (rev 5208)
+++ branches/STABLE-BRANCH-2-0/common/Makefile.am	2009-12-04 11:38:41 UTC (rev 5209)
@@ -97,16 +97,20 @@
         gpgrlhelp.c
 
 # Create the audit-events.h include file from audit.h
+# Note: We create the target file in the source directory because it
+# is a distributed built source.  If we would not do that we may end
+# up with two files and then it is not clear which version of the
+# files will be picked up.
 audit-events.h: Makefile mkstrtable.awk exaudit.awk audit.h
 	$(AWK) -f $(srcdir)/exaudit.awk $(srcdir)/audit.h \
 	  | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
-		   -v namespace=eventstr_  >$@
+		   -v namespace=eventstr_  > $(srcdir)/$@
 
 # Create the status-codes.h include file from status.h
 status-codes.h: Makefile mkstrtable.awk exstatus.awk status.h
 	$(AWK) -f $(srcdir)/exstatus.awk $(srcdir)/status.h \
 	  | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
-		   -v namespace=statusstr_  >$@
+		   -v namespace=statusstr_  > $(srcdir)/$@
 
 
 #