aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2018-10-05 13:14:58 +0000
committerWerner Koch <[email protected]>2018-10-05 13:14:58 +0000
commitecfa48fffa93f3d1b66354d2d46872ff614c4a68 (patch)
treeaa5f78975ed324147cb683fb6fe6761463a5b29a /doc
parentdocs: whitespace bug (diff)
downloadgpgme-ecfa48fffa93f3d1b66354d2d46872ff614c4a68.tar.gz
gpgme-ecfa48fffa93f3d1b66354d2d46872ff614c4a68.zip
build: Move config.h to conf/config.h
* conf/: New dir. * configure.ac (AC_CONFIG_HEADER): Move header to conf dir. * doc/Makefile.am (mkdefsinc): Adjust rule. * lang/python/Makefile.am (copystamp): Ditto. -- C++ uses those stupid files without a suffix and thus the new standard header <version> as included by newer other libc++ versions may conflict with the VERSION file in out top directory. This change should solve the problem. GnuPG-bug-id: 4168 Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index db8a1a21..2b4730ee 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -34,9 +34,9 @@ gpgme_TEXINFOS = uiserver.texi lesser.texi gpl.texi
gpgme.texi : defs.inc
-mkdefsinc: mkdefsinc.c Makefile ../config.h
- $(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \
- -o $@ $(srcdir)/mkdefsinc.c
+mkdefsinc: mkdefsinc.c Makefile $(top_builddir)/conf/config.h
+ $(CC_FOR_BUILD) -I. -I$(top_builddir)/conf -I$(srcdir) \
+ $(AM_CPPFLAGS) -o $@ $(srcdir)/mkdefsinc.c
dist-hook: defsincdate