summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWez Furlong <wez@netevil.org>2011-04-03 17:42:46 -0400
committerWez Furlong <wez@netevil.org>2011-04-03 17:42:46 -0400
commit8e4e3efb4e7c3bdb86f247bd161d0809757609c8 (patch)
treee56dab3589844e187420cdd5bac70f3b70c4c26a
parente9f8c2cd7be8f75fb1d6d9bdb7f3f418d5068e04 (diff)
downloadctf-8e4e3efb4e7c3bdb86f247bd161d0809757609c8.tar.gz
ensure that we install headers under pctf/ as we promised in the README
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--libctf/ctf_impl.h2
-rw-r--r--pctf/ctf_api.h1
4 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index f7f7a50..183dc15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ CFLAGS += -I$(top_srcdir)
lib_LTLIBRARIES = libpctf.la
noinst_LTLIBRARIES = libpctfcommon.la libcvt.la libdwarf.la
man1_MANS = man/ctfconvert.1 man/ctfmerge.1 man/ctfdump.1
-include_HEADERS = pctf/libctf.h pctf/ctf_api.h pctf/ctf.h
+nobase_include_HEADERS = pctf/libctf.h pctf/ctf_api.h pctf/ctf.h pctf/pctf_config.h
libpctfcommon_la_SOURCES = \
common/list.c \
diff --git a/configure.ac b/configure.ac
index 0712796..d3525d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ unistd.h \
zlib.h \
])
-AC_CONFIG_HEADERS(pctf_config.h)
+AC_CONFIG_HEADERS(pctf/pctf_config.h)
AC_CONFIG_FILES(Makefile)
AC_OUTPUT
diff --git a/libctf/ctf_impl.h b/libctf/ctf_impl.h
index d7f0075..a8f0787 100644
--- a/libctf/ctf_impl.h
+++ b/libctf/ctf_impl.h
@@ -30,7 +30,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#include "pctf_config.h"
+#include "pctf/pctf_config.h"
#define CTF_OLD_VERSIONS
diff --git a/pctf/ctf_api.h b/pctf/ctf_api.h
index 9a7b91e..0be516d 100644
--- a/pctf/ctf_api.h
+++ b/pctf/ctf_api.h
@@ -42,6 +42,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
+#include <pctf/pctf_config.h>
#include <sys/types.h>
#include <pctf/ctf.h>