From 97be89b60bd57272ece637bc2f300a5288b78831 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 2 Sep 2008 21:20:44 -0400 Subject: Fix pkg-config files: use Requires.private and fix the include directory Addresses-Sourceforge-Bug: #2089537 Signed-off-by: "Theodore Ts'o" --- lib/blkid/blkid.pc.in | 4 ++-- lib/e2p/e2p.pc.in | 2 +- lib/et/com_err.pc.in | 2 +- lib/ext2fs/ext2fs.pc.in | 4 ++-- lib/ss/ss.pc.in | 4 ++-- lib/uuid/uuid.pc.in | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/blkid/blkid.pc.in b/lib/blkid/blkid.pc.in index fda7f921..b984f6d0 100644 --- 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 41b4129d..98ee9fb7 100644 --- 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 c42774a1..a43d1c58 100644 --- 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 0a5cd86c..8db86635 100644 --- 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 ce284fc9..cf893611 100644 --- 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 e15a2be7..9e38a326 100644 --- 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 -- cgit v1.2.3