Change pkg-config files so that both <et/com_err.h> and <com_err.h> work

Change the include path in the Cflags field so that #include
<lib/foo.h> and <foo.h> will work.  We had originally used a C flags
which allowed <foo.h> to work, but many applications (especially those
not using pkg-config) had been using the <lob/foo.h> formulation which
didn't require an explicit -I{$includedir} option to the C compiler.

If those applications then converted over to pkg-config, and the
e2fsprogs libraries were installed with a prefix other than /usr, so
that the header files were in some directory such as
/usr/local/include, a program that used #include <lib/foo.h> would
fail to compile.

So change the pkg-config files to include both -I{$includedir} and
-I{$includir}/lib.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/blkid/blkid.pc.in b/lib/blkid/blkid.pc.in
index b984f6d..808fe22 100644 (file)
--- a/lib/blkid/blkid.pc.in
+++ b/lib/blkid/blkid.pc.in
@@ -7,5 +7,5 @@ Name: blkid
 Description: Block device id library
 Version: @E2FSPROGS_VERSION@
 Requires.private: uuid
-Cflags: -I${includedir}/blkid
+Cflags: -I${includedir}/blkid -I${includedir}
 Libs: -L${libdir} -lblkid

diff --git a/lib/e2p/e2p.pc.in b/lib/e2p/e2p.pc.in
index 98ee9fb..c171ae6 100644 (file)
--- a/lib/e2p/e2p.pc.in
+++ b/lib/e2p/e2p.pc.in
@@ -7,5 +7,5 @@ Name: e2p
 Description: Ext2fs userpace programs utility library
 Version: @E2FSPROGS_VERSION@
 Requires: 
-Cflags: -I${includedir}/e2p
+Cflags: -I${includedir}/e2p -I${includedir}
 Libs: -L${libdir} -le2p

diff --git a/lib/et/com_err.pc.in b/lib/et/com_err.pc.in
index cb47ce1..86df8a2 100644 (file)
--- a/lib/et/com_err.pc.in
+++ b/lib/et/com_err.pc.in
@@ -7,6 +7,6 @@ Name: com_err
 Description: Common error description library
 Version: @E2FSPROGS_VERSION@
 Requires:
-Cflags: -I${includedir}
+Cflags: -I${includedir}/et -I${includedir}
 Libs: -L${libdir} -lcom_err
 Libs.private: @SEM_INIT_LIB@

diff --git a/lib/ext2fs/ext2fs.pc.in b/lib/ext2fs/ext2fs.pc.in
index 8db8663..efac85e 100644 (file)
--- a/lib/ext2fs/ext2fs.pc.in
+++ b/lib/ext2fs/ext2fs.pc.in
@@ -7,5 +7,5 @@ Name: ext2fs
 Description: Ext2fs library
 Version: @E2FSPROGS_VERSION@
 Requires.private: com_err
-Cflags: -I${includedir}/ext2fs
+Cflags: -I${includedir}/ext2fs -I${includedir}
 Libs: -L${libdir} -lext2fs

diff --git a/lib/quota/quota.pc.in b/lib/quota/quota.pc.in
index bcc3c44..1e4b887 100644 (file)
--- a/lib/quota/quota.pc.in
+++ b/lib/quota/quota.pc.in
@@ -7,5 +7,5 @@ Name: quota
 Description: Quota management library
 Version: @E2FSPROGS_VERSION@
 Requires:
-Cflags: -I${includedir}/quota
+Cflags: -I${includedir}/quota -I${includedir}
 Libs: -L${libdir} -lquota

diff --git a/lib/ss/ss.pc.in b/lib/ss/ss.pc.in
index cf89361..5c9eccb 100644 (file)
--- a/lib/ss/ss.pc.in
+++ b/lib/ss/ss.pc.in
@@ -7,6 +7,6 @@ Name: ss
 Description: Subsystem command parsing library
 Version: @E2FSPROGS_VERSION@
 Requires.private: com_err
-Cflags: -I${includedir}/ss
+Cflags: -I${includedir}/ss -I${includedir}
 Libs: -L${libdir} -lss
 Libs.private: @DLOPEN_LIB@

diff --git a/lib/uuid/uuid.pc.in b/lib/uuid/uuid.pc.in
index 9e38a32..eaa4e4d 100644 (file)
--- a/lib/uuid/uuid.pc.in
+++ b/lib/uuid/uuid.pc.in
@@ -7,5 +7,5 @@ Name: uuid
 Description: Universally unique id library
 Version: @E2FSPROGS_VERSION@
 Requires: 
-Cflags: -I${includedir}/uuid
+Cflags: -I${includedir}/uuid -I${includedir}
 Libs: -L${libdir} -luuid