85 files changed, 11 insertions, 11 deletions

diff --git a/Makefile.am b/Makefile.am
index 5c4fbf3f0a2aa..8e236a7163a45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib bin modules include
+SUBDIRS = lib/libpam bin modules include
 
 if WITH_DOC
 SUBDIRS += doc
diff --git a/bin/openpam_dump_policy/Makefile.am b/bin/openpam_dump_policy/Makefile.am
index a5fda16068bfc..2af2eaf3036f8 100644
--- a/bin/openpam_dump_policy/Makefile.am
+++ b/bin/openpam_dump_policy/Makefile.am
@@ -1,7 +1,7 @@
 # $Id: Makefile.am 538 2012-03-31 17:04:29Z des $
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
 
 noinst_PROGRAMS = openpam_dump_policy
 openpam_dump_policy_SOURCES = openpam_dump_policy.c
-openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam.la
+openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam/libpam.la
diff --git a/bin/pamtest/Makefile.am b/bin/pamtest/Makefile.am
index 80694def17a46..943872c2699b3 100644
--- a/bin/pamtest/Makefile.am
+++ b/bin/pamtest/Makefile.am
@@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = pamtest
 pamtest_SOURCES = pamtest.c
-pamtest_LDADD = $(top_builddir)/lib/libpam.la
+pamtest_LDADD = $(top_builddir)/lib/libpam/libpam.la
 
 dist_man1_MANS = pamtest.1
diff --git a/bin/su/Makefile.am b/bin/su/Makefile.am
index 50f0cb986e450..b0462c8c0e432 100644
--- a/bin/su/Makefile.am
+++ b/bin/su/Makefile.am
@@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = su
 su_SOURCES = su.c
-su_LDADD = $(top_builddir)/lib/libpam.la
+su_LDADD = $(top_builddir)/lib/libpam/libpam.la
 
 dist_man1_MANS = su.1
diff --git a/configure.ac b/configure.ac
index fb30726a4d1b8..4abd34d6f11ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl $Id: configure.ac 610 2012-05-26 14:03:45Z des $
 AC_PREREQ([2.62])
 AC_REVISION([$Id: configure.ac 610 2012-05-26 14:03:45Z des $])
 AC_INIT([OpenPAM], [20120526], [des@des.no])
-AC_CONFIG_SRCDIR([lib/pam_start.c])
+AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER([config.h])
@@ -119,7 +119,7 @@ AC_CONFIG_FILES([
     doc/man/Makefile
     include/Makefile
     include/security/Makefile
-    lib/Makefile
+    lib/libpam/Makefile
     modules/Makefile
     modules/pam_deny/Makefile
     modules/pam_permit/Makefile
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 4062a54d54fb9..947710a7a5c5c 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -73,7 +73,7 @@ CLEANFILES = $(ALLCMAN) openpam.3 pam.3
 
 GENDOC = $(top_srcdir)/misc/gendoc.pl
 
-LIBSRCDIR = $(top_srcdir)/lib
+LIBSRCDIR = $(top_srcdir)/lib/libpam
 
 VPATH = $(LIBSRCDIR) $(srcdir)
 
diff --git a/lib/Makefile.am b/lib/libpam/Makefile.am
index 9ce2d2f5bc1e2..9ce2d2f5bc1e2 100644
--- a/lib/Makefile.am
+++ b/lib/libpam/Makefile.am
diff --git a/lib/Makefile.in b/lib/libpam/Makefile.in
index 353fbaba9b64a..353fbaba9b64a 100644
--- a/lib/Makefile.in
+++ b/lib/libpam/Makefile.in
diff --git a/lib/openpam_borrow_cred.c b/lib/libpam/openpam_borrow_cred.c
index e0dfc555758fb..e0dfc555758fb 100644
--- a/lib/openpam_borrow_cred.c
+++ b/lib/libpam/openpam_borrow_cred.c
diff --git a/lib/openpam_check_owner_perms.c b/lib/libpam/openpam_check_owner_perms.c
index d3b2ca98596b6..d3b2ca98596b6 100644
--- a/lib/openpam_check_owner_perms.c
+++ b/lib/libpam/openpam_check_owner_perms.c
diff --git a/lib/openpam_configure.c b/lib/libpam/openpam_configure.c
index 8172a6fdf11c4..8172a6fdf11c4 100644
--- a/lib/openpam_configure.c
+++ b/lib/libpam/openpam_configure.c
diff --git a/lib/openpam_constants.c b/lib/libpam/openpam_constants.c
index 833e81f280201..833e81f280201 100644
--- a/lib/openpam_constants.c
+++ b/lib/libpam/openpam_constants.c
diff --git a/lib/openpam_constants.h b/lib/libpam/openpam_constants.h
index a7d6ce8dd7d7c..a7d6ce8dd7d7c 100644
--- a/lib/openpam_constants.h
+++ b/lib/libpam/openpam_constants.h
diff --git a/lib/openpam_ctype.h b/lib/libpam/openpam_ctype.h
index b3ec846899703..b3ec846899703 100644
--- a/lib/openpam_ctype.h
+++ b/lib/libpam/openpam_ctype.h
diff --git a/lib/openpam_debug.h b/lib/libpam/openpam_debug.h
index 050783e49369c..050783e49369c 100644
--- a/lib/openpam_debug.h
+++ b/lib/libpam/openpam_debug.h
diff --git a/lib/openpam_dispatch.c b/lib/libpam/openpam_dispatch.c
index 54dfd3bdc8f31..54dfd3bdc8f31 100644
--- a/lib/openpam_dispatch.c
+++ b/lib/libpam/openpam_dispatch.c
diff --git a/lib/openpam_dynamic.c b/lib/libpam/openpam_dynamic.c
index 1dfc1ac43eb84..1dfc1ac43eb84 100644
--- a/lib/openpam_dynamic.c
+++ b/lib/libpam/openpam_dynamic.c
diff --git a/lib/openpam_features.c b/lib/libpam/openpam_features.c
index 586fc2a573050..586fc2a573050 100644
--- a/lib/openpam_features.c
+++ b/lib/libpam/openpam_features.c
diff --git a/lib/openpam_features.h b/lib/libpam/openpam_features.h
index 227b1a9f729c5..227b1a9f729c5 100644
--- a/lib/openpam_features.h
+++ b/lib/libpam/openpam_features.h
diff --git a/lib/openpam_findenv.c b/lib/libpam/openpam_findenv.c
index b833ec9229c0c..b833ec9229c0c 100644
--- a/lib/openpam_findenv.c
+++ b/lib/libpam/openpam_findenv.c
diff --git a/lib/openpam_free_data.c b/lib/libpam/openpam_free_data.c
index 561687c7ec2e6..561687c7ec2e6 100644
--- a/lib/openpam_free_data.c
+++ b/lib/libpam/openpam_free_data.c
diff --git a/lib/openpam_free_envlist.c b/lib/libpam/openpam_free_envlist.c
index 14754dc4031b9..14754dc4031b9 100644
--- a/lib/openpam_free_envlist.c
+++ b/lib/libpam/openpam_free_envlist.c
diff --git a/lib/openpam_get_feature.c b/lib/libpam/openpam_get_feature.c
index b552357c58d4c..b552357c58d4c 100644
--- a/lib/openpam_get_feature.c
+++ b/lib/libpam/openpam_get_feature.c
diff --git a/lib/openpam_get_option.c b/lib/libpam/openpam_get_option.c
index 1f62d218ebfcf..1f62d218ebfcf 100644
--- a/lib/openpam_get_option.c
+++ b/lib/libpam/openpam_get_option.c
diff --git a/lib/openpam_impl.h b/lib/libpam/openpam_impl.h
index 9e8b45f6d55c2..9e8b45f6d55c2 100644
--- a/lib/openpam_impl.h
+++ b/lib/libpam/openpam_impl.h
diff --git a/lib/openpam_load.c b/lib/libpam/openpam_load.c
index 871d1a8c057c9..871d1a8c057c9 100644
--- a/lib/openpam_load.c
+++ b/lib/libpam/openpam_load.c
diff --git a/lib/openpam_log.c b/lib/libpam/openpam_log.c
index 2b89f6c6d7d17..2b89f6c6d7d17 100644
--- a/lib/openpam_log.c
+++ b/lib/libpam/openpam_log.c
diff --git a/lib/openpam_nullconv.c b/lib/libpam/openpam_nullconv.c
index a95b1e0c50f81..a95b1e0c50f81 100644
--- a/lib/openpam_nullconv.c
+++ b/lib/libpam/openpam_nullconv.c
diff --git a/lib/openpam_readline.c b/lib/libpam/openpam_readline.c
index 047ab836910aa..047ab836910aa 100644
--- a/lib/openpam_readline.c
+++ b/lib/libpam/openpam_readline.c
diff --git a/lib/openpam_readlinev.c b/lib/libpam/openpam_readlinev.c
index 5a43b61f36f20..5a43b61f36f20 100644
--- a/lib/openpam_readlinev.c
+++ b/lib/libpam/openpam_readlinev.c
diff --git a/lib/openpam_readword.c b/lib/libpam/openpam_readword.c
index 1c0e9b68149c5..1c0e9b68149c5 100644
--- a/lib/openpam_readword.c
+++ b/lib/libpam/openpam_readword.c
diff --git a/lib/openpam_restore_cred.c b/lib/libpam/openpam_restore_cred.c
index 41d44d024d5c2..41d44d024d5c2 100644
--- a/lib/openpam_restore_cred.c
+++ b/lib/libpam/openpam_restore_cred.c
diff --git a/lib/openpam_set_feature.c b/lib/libpam/openpam_set_feature.c
index 4f6a4a5c92c75..4f6a4a5c92c75 100644
--- a/lib/openpam_set_feature.c
+++ b/lib/libpam/openpam_set_feature.c
diff --git a/lib/openpam_set_option.c b/lib/libpam/openpam_set_option.c
index 1712a718ec4ca..1712a718ec4ca 100644
--- a/lib/openpam_set_option.c
+++ b/lib/libpam/openpam_set_option.c
diff --git a/lib/openpam_static.c b/lib/libpam/openpam_static.c
index 40b807cb3698b..40b807cb3698b 100644
--- a/lib/openpam_static.c
+++ b/lib/libpam/openpam_static.c
diff --git a/lib/openpam_straddch.c b/lib/libpam/openpam_straddch.c
index 9845cc610a93e..9845cc610a93e 100644
--- a/lib/openpam_straddch.c
+++ b/lib/libpam/openpam_straddch.c
diff --git a/lib/openpam_strlcat.h b/lib/libpam/openpam_strlcat.h
index 1f266936be431..1f266936be431 100644
--- a/lib/openpam_strlcat.h
+++ b/lib/libpam/openpam_strlcat.h
diff --git a/lib/openpam_strlcmp.h b/lib/libpam/openpam_strlcmp.h
index 2a78e0f67666d..2a78e0f67666d 100644
--- a/lib/openpam_strlcmp.h
+++ b/lib/libpam/openpam_strlcmp.h
diff --git a/lib/openpam_strlcpy.h b/lib/libpam/openpam_strlcpy.h
index 9c65548348303..9c65548348303 100644
--- a/lib/openpam_strlcpy.h
+++ b/lib/libpam/openpam_strlcpy.h
diff --git a/lib/openpam_subst.c b/lib/libpam/openpam_subst.c
index bab7a785faa9d..bab7a785faa9d 100644
--- a/lib/openpam_subst.c
+++ b/lib/libpam/openpam_subst.c
diff --git a/lib/openpam_ttyconv.c b/lib/libpam/openpam_ttyconv.c
index 14a324d59ed3a..14a324d59ed3a 100644
--- a/lib/openpam_ttyconv.c
+++ b/lib/libpam/openpam_ttyconv.c
diff --git a/lib/pam_acct_mgmt.c b/lib/libpam/pam_acct_mgmt.c
index 49c34ab3ea65b..49c34ab3ea65b 100644
--- a/lib/pam_acct_mgmt.c
+++ b/lib/libpam/pam_acct_mgmt.c
diff --git a/lib/pam_authenticate.c b/lib/libpam/pam_authenticate.c
index fc6c20f394dc1..fc6c20f394dc1 100644
--- a/lib/pam_authenticate.c
+++ b/lib/libpam/pam_authenticate.c
diff --git a/lib/pam_authenticate_secondary.c b/lib/libpam/pam_authenticate_secondary.c
index 1a57313589702..1a57313589702 100644
--- a/lib/pam_authenticate_secondary.c
+++ b/lib/libpam/pam_authenticate_secondary.c
diff --git a/lib/pam_chauthtok.c b/lib/libpam/pam_chauthtok.c
index 1750b0f5fdd72..1750b0f5fdd72 100644
--- a/lib/pam_chauthtok.c
+++ b/lib/libpam/pam_chauthtok.c
diff --git a/lib/pam_close_session.c b/lib/libpam/pam_close_session.c
index 9e63a1dc965fb..9e63a1dc965fb 100644
--- a/lib/pam_close_session.c
+++ b/lib/libpam/pam_close_session.c
diff --git a/lib/pam_end.c b/lib/libpam/pam_end.c
index 09cde350ea6a8..09cde350ea6a8 100644
--- a/lib/pam_end.c
+++ b/lib/libpam/pam_end.c
diff --git a/lib/pam_error.c b/lib/libpam/pam_error.c
index 1e0de5b267b43..1e0de5b267b43 100644
--- a/lib/pam_error.c
+++ b/lib/libpam/pam_error.c
diff --git a/lib/pam_get_authtok.c b/lib/libpam/pam_get_authtok.c
index 1a3aebc810937..1a3aebc810937 100644
--- a/lib/pam_get_authtok.c
+++ b/lib/libpam/pam_get_authtok.c
diff --git a/lib/pam_get_data.c b/lib/libpam/pam_get_data.c
index 1a8ba1de8df5e..1a8ba1de8df5e 100644
--- a/lib/pam_get_data.c
+++ b/lib/libpam/pam_get_data.c
diff --git a/lib/pam_get_item.c b/lib/libpam/pam_get_item.c
index 95b9df6d02bdf..95b9df6d02bdf 100644
--- a/lib/pam_get_item.c
+++ b/lib/libpam/pam_get_item.c
diff --git a/lib/pam_get_mapped_authtok.c b/lib/libpam/pam_get_mapped_authtok.c
index 54ff6c3e7e893..54ff6c3e7e893 100644
--- a/lib/pam_get_mapped_authtok.c
+++ b/lib/libpam/pam_get_mapped_authtok.c
diff --git a/lib/pam_get_mapped_username.c b/lib/libpam/pam_get_mapped_username.c
index 4f8ac17fd1312..4f8ac17fd1312 100644
--- a/lib/pam_get_mapped_username.c
+++ b/lib/libpam/pam_get_mapped_username.c
diff --git a/lib/pam_get_user.c b/lib/libpam/pam_get_user.c
index 53245b99e57df..53245b99e57df 100644
--- a/lib/pam_get_user.c
+++ b/lib/libpam/pam_get_user.c
diff --git a/lib/pam_getenv.c b/lib/libpam/pam_getenv.c
index e2ebf579edaad..e2ebf579edaad 100644
--- a/lib/pam_getenv.c
+++ b/lib/libpam/pam_getenv.c
diff --git a/lib/pam_getenvlist.c b/lib/libpam/pam_getenvlist.c
index 06c003f02ef6e..06c003f02ef6e 100644
--- a/lib/pam_getenvlist.c
+++ b/lib/libpam/pam_getenvlist.c
diff --git a/lib/pam_info.c b/lib/libpam/pam_info.c
index 7e51dbf6b8890..7e51dbf6b8890 100644
--- a/lib/pam_info.c
+++ b/lib/libpam/pam_info.c
diff --git a/lib/pam_open_session.c b/lib/libpam/pam_open_session.c
index 36c59b049e2af..36c59b049e2af 100644
--- a/lib/pam_open_session.c
+++ b/lib/libpam/pam_open_session.c
diff --git a/lib/pam_prompt.c b/lib/libpam/pam_prompt.c
index 194e7655237fa..194e7655237fa 100644
--- a/lib/pam_prompt.c
+++ b/lib/libpam/pam_prompt.c
diff --git a/lib/pam_putenv.c b/lib/libpam/pam_putenv.c
index e1f0bc35e29c8..e1f0bc35e29c8 100644
--- a/lib/pam_putenv.c
+++ b/lib/libpam/pam_putenv.c
diff --git a/lib/pam_set_data.c b/lib/libpam/pam_set_data.c
index a8de632f7bf72..a8de632f7bf72 100644
--- a/lib/pam_set_data.c
+++ b/lib/libpam/pam_set_data.c
diff --git a/lib/pam_set_item.c b/lib/libpam/pam_set_item.c
index 05d538f7bdcad..05d538f7bdcad 100644
--- a/lib/pam_set_item.c
+++ b/lib/libpam/pam_set_item.c
diff --git a/lib/pam_set_mapped_authtok.c b/lib/libpam/pam_set_mapped_authtok.c
index d8db84fd34fab..d8db84fd34fab 100644
--- a/lib/pam_set_mapped_authtok.c
+++ b/lib/libpam/pam_set_mapped_authtok.c
diff --git a/lib/pam_set_mapped_username.c b/lib/libpam/pam_set_mapped_username.c
index 4b8f8153916df..4b8f8153916df 100644
--- a/lib/pam_set_mapped_username.c
+++ b/lib/libpam/pam_set_mapped_username.c
diff --git a/lib/pam_setcred.c b/lib/libpam/pam_setcred.c
index 51fb0816b6d80..51fb0816b6d80 100644
--- a/lib/pam_setcred.c
+++ b/lib/libpam/pam_setcred.c
diff --git a/lib/pam_setenv.c b/lib/libpam/pam_setenv.c
index 6fd4c1001e834..6fd4c1001e834 100644
--- a/lib/pam_setenv.c
+++ b/lib/libpam/pam_setenv.c
diff --git a/lib/pam_sm_acct_mgmt.c b/lib/libpam/pam_sm_acct_mgmt.c
index f5c14cf99a7a8..f5c14cf99a7a8 100644
--- a/lib/pam_sm_acct_mgmt.c
+++ b/lib/libpam/pam_sm_acct_mgmt.c
diff --git a/lib/pam_sm_authenticate.c b/lib/libpam/pam_sm_authenticate.c
index 97851af43e698..97851af43e698 100644
--- a/lib/pam_sm_authenticate.c
+++ b/lib/libpam/pam_sm_authenticate.c
diff --git a/lib/pam_sm_authenticate_secondary.c b/lib/libpam/pam_sm_authenticate_secondary.c
index 3f3f6bdf4705c..3f3f6bdf4705c 100644
--- a/lib/pam_sm_authenticate_secondary.c
+++ b/lib/libpam/pam_sm_authenticate_secondary.c
diff --git a/lib/pam_sm_chauthtok.c b/lib/libpam/pam_sm_chauthtok.c
index 593344cca2220..593344cca2220 100644
--- a/lib/pam_sm_chauthtok.c
+++ b/lib/libpam/pam_sm_chauthtok.c
diff --git a/lib/pam_sm_close_session.c b/lib/libpam/pam_sm_close_session.c
index 290f497b1cd5e..290f497b1cd5e 100644
--- a/lib/pam_sm_close_session.c
+++ b/lib/libpam/pam_sm_close_session.c
diff --git a/lib/pam_sm_get_mapped_authtok.c b/lib/libpam/pam_sm_get_mapped_authtok.c
index e86e6e5d3624d..e86e6e5d3624d 100644
--- a/lib/pam_sm_get_mapped_authtok.c
+++ b/lib/libpam/pam_sm_get_mapped_authtok.c
diff --git a/lib/pam_sm_get_mapped_username.c b/lib/libpam/pam_sm_get_mapped_username.c
index 596ca6cb1abae..596ca6cb1abae 100644
--- a/lib/pam_sm_get_mapped_username.c
+++ b/lib/libpam/pam_sm_get_mapped_username.c
diff --git a/lib/pam_sm_open_session.c b/lib/libpam/pam_sm_open_session.c
index acb401ab3da78..acb401ab3da78 100644
--- a/lib/pam_sm_open_session.c
+++ b/lib/libpam/pam_sm_open_session.c
diff --git a/lib/pam_sm_set_mapped_authtok.c b/lib/libpam/pam_sm_set_mapped_authtok.c
index dab40fd9d001a..dab40fd9d001a 100644
--- a/lib/pam_sm_set_mapped_authtok.c
+++ b/lib/libpam/pam_sm_set_mapped_authtok.c
diff --git a/lib/pam_sm_set_mapped_username.c b/lib/libpam/pam_sm_set_mapped_username.c
index 3011016b4b415..3011016b4b415 100644
--- a/lib/pam_sm_set_mapped_username.c
+++ b/lib/libpam/pam_sm_set_mapped_username.c
diff --git a/lib/pam_sm_setcred.c b/lib/libpam/pam_sm_setcred.c
index 0d306838bc1b9..0d306838bc1b9 100644
--- a/lib/pam_sm_setcred.c
+++ b/lib/libpam/pam_sm_setcred.c
diff --git a/lib/pam_start.c b/lib/libpam/pam_start.c
index 84e0085b30b77..84e0085b30b77 100644
--- a/lib/pam_start.c
+++ b/lib/libpam/pam_start.c
diff --git a/lib/pam_strerror.c b/lib/libpam/pam_strerror.c
index e29219d8472df..e29219d8472df 100644
--- a/lib/pam_strerror.c
+++ b/lib/libpam/pam_strerror.c
diff --git a/lib/pam_verror.c b/lib/libpam/pam_verror.c
index 9ed85b688a087..9ed85b688a087 100644
--- a/lib/pam_verror.c
+++ b/lib/libpam/pam_verror.c
diff --git a/lib/pam_vinfo.c b/lib/libpam/pam_vinfo.c
index 95f45f4d20626..95f45f4d20626 100644
--- a/lib/pam_vinfo.c
+++ b/lib/libpam/pam_vinfo.c
diff --git a/lib/pam_vprompt.c b/lib/libpam/pam_vprompt.c
index 1e390e09c36bc..1e390e09c36bc 100644
--- a/lib/pam_vprompt.c
+++ b/lib/libpam/pam_vprompt.c
diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am
index d432915cc50e8..ae6f59b69e85e 100644
--- a/modules/pam_deny/Makefile.am
+++ b/modules/pam_deny/Makefile.am
@@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_deny.la
 
 pam_deny_la_SOURCES = pam_deny.c
 pam_deny_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
-pam_deny_la_LIBADD = $(top_builddir)/lib/libpam.la
+pam_deny_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index 363ca7cf22935..ab598543c0f36 100644
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_permit.la
 
 pam_permit_la_SOURCES = pam_permit.c
 pam_permit_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
-pam_permit_la_LIBADD = $(top_builddir)/lib/libpam.la
+pam_permit_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index ad1ec67958f69..e368d1189c5a0 100644
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -8,5 +8,5 @@ pkglib_LTLIBRARIES = pam_unix.la
 
 pam_unix_la_SOURCES = pam_unix.c
 pam_unix_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
-pam_unix_la_LIBADD = $(top_builddir)/lib/libpam.la @CRYPT_LIBS@
+pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPT_LIBS@
 endif