Fix pkg-config files: use Requires.private and fix the include directory

Addresses-Sourceforge-Bug: #2089537

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

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

diff --git a/lib/e2p/e2p.pc.in b/lib/e2p/e2p.pc.in
index 41b4129dce2ca381b8a1fe3e98fa9804b3d48a87..98ee9fb7c9b7d423c8670c30857520d7ae8602c1 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} 
+Cflags: -I${includedir}/e2p
 Libs: -L${libdir} -le2p

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

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

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

diff --git a/lib/uuid/uuid.pc.in b/lib/uuid/uuid.pc.in
index e15a2be7a26d66fb3d2026dd046ec017fea07dd1..9e38a32651d1d78804ac632c2aeb8608c27a7a8d 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} 
+Cflags: -I${includedir}/uuid
 Libs: -L${libdir} -luuid