Fix includedir in pkgconfig files

The includedir variable in pkgconfig files used to erroneously contain
"security" subsirectory, e.g. /usr/include/security, which led to Cflags
tag containing wrong -I compiler option, e.g. -I/usr/include/security.

Fixes: b4f0e2e1f7a1 ("Add pkgconfig files for provided libraries")

4 files changed, 7 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index bbd4af48..0c5fd4cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,10 @@ dnl By default, everything under PAM is installed below /usr.
 dnl
 AC_PREFIX_DEFAULT(/usr)
 
+dnl for use instead of includedir substitutions in *.pc files
+pkgconfig_includedir=$includedir
+AC_SUBST(pkgconfig_includedir)
+
 dnl and some hacks to use /etc and /lib
 test "${prefix}" = "NONE" && prefix="/usr"
 if test ${prefix} = '/usr'
diff --git a/libpam/pam.pc.in b/libpam/pam.pc.in
index c3fafe4b..73049f1e 100644
--- a/libpam/pam.pc.in
+++ b/libpam/pam.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@pkgconfig_includedir@
 
 Name: PAM
 Description: The primary Linux-PAM library. It is used by PAM modules and PAM-aware applications.
diff --git a/libpam_misc/pam_misc.pc.in b/libpam_misc/pam_misc.pc.in
index c3e03c4f..c1e69d21 100644
--- a/libpam_misc/pam_misc.pc.in
+++ b/libpam_misc/pam_misc.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@pkgconfig_includedir@
 
 Name: pam_misc
 Description: Miscellaneous functions that make the job of writing PAM-aware applications easier.
diff --git a/libpamc/pamc.pc.in b/libpamc/pamc.pc.in
index 2d841ebb..6e7ec29e 100644
--- a/libpamc/pamc.pc.in
+++ b/libpamc/pamc.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@pkgconfig_includedir@
 
 Name: libpamc
 URL: http://www.linux-pam.org/