From 66a00191200f7be614d5e812f706988a0d65d56c Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 4 Dec 2009 11:37:12 +0000 Subject: [PATCH] Fix possible problem with chnages status.h and VBUILDS. --- common/ChangeLog | 5 +++++ common/Makefile.am | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/ChangeLog b/common/ChangeLog index 60157680d..e2da8a01a 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,8 @@ +2009-12-04 Werner Koch + + * Makefile.am (audit-events.h, status-codes.h): Create files in + the source dir. Fixes bug#1164. + 2009-12-02 Werner Koch * audit.c (proc_type_decrypt, proc_type_sign): Implemented. diff --git a/common/Makefile.am b/common/Makefile.am index 10be46eba..29312c9dc 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -97,16 +97,20 @@ libgpgrl_a_SOURCES = \ 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)/$@ #