diff options
| author | Werner Koch <[email protected]> | 2009-12-04 11:38:41 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-12-04 11:38:41 +0000 |
| commit | c9c3db1fef16f14a4cd5a2d7e065ddf7bef8a9d3 (patch) | |
| tree | a7348a1db890b7d0e3483b4a506a54f390f9ed16 | |
| parent | Backported some stuff from trunk (diff) | |
| download | gnupg-c9c3db1fef16f14a4cd5a2d7e065ddf7bef8a9d3.tar.gz gnupg-c9c3db1fef16f14a4cd5a2d7e065ddf7bef8a9d3.zip | |
Fix for bug 1164
| -rw-r--r-- | common/ChangeLog | 5 | ||||
| -rw-r--r-- | common/Makefile.am | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 8b6b67d89..1e1089a87 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,8 @@ +2009-12-04 Werner Koch <[email protected]> + + * Makefile.am (audit-events.h, status-codes.h): Create files in + the source dir. Fixes bug#1164. + 2009-12-03 Werner Koch <[email protected]> From trunk: diff --git a/common/Makefile.am b/common/Makefile.am index dd3661dac..bd0f0c234 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)/$@ # |