From dc504e09403881b774efa4ef37bd07b6bcea8487 Mon Sep 17 00:00:00 2001 From: Bandie Date: Thu, 1 Nov 2018 12:48:24 +0100 Subject: [PATCH 1/4] Fixes #80 --- configure.ac | 1 + src/pam_panic/Makefile.am | 2 +- src/pam_panic/data/Makefile.am | 2 ++ src/pam_panic/data/auth | 0 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/pam_panic/data/Makefile.am create mode 100644 src/pam_panic/data/auth diff --git a/configure.ac b/configure.ac index 7dfcde0..b9b40de 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,7 @@ AC_CONFIG_FILES([ po4a/Makefile src/pam_panic/Makefile src/pam_panic/man/Makefile + src/pam_panic/data/Makefile src/pam_panic_pw/Makefile src/pam_panic_pw/man/Makefile src/pam_panic_config/Makefile diff --git a/src/pam_panic/Makefile.am b/src/pam_panic/Makefile.am index 32ff1d2..3873cfd 100644 --- a/src/pam_panic/Makefile.am +++ b/src/pam_panic/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = man +SUBDIRS = man data securelibdir = $(SECUREDIR) securelibexecdir = $(securelibdir) diff --git a/src/pam_panic/data/Makefile.am b/src/pam_panic/data/Makefile.am new file mode 100644 index 0000000..dd5befb --- /dev/null +++ b/src/pam_panic/data/Makefile.am @@ -0,0 +1,2 @@ +authdir = $$(dirname $(PPASSFILE)) +auth_DATA = auth diff --git a/src/pam_panic/data/auth b/src/pam_panic/data/auth new file mode 100644 index 0000000..e69de29 From eaba486160636c6bf9e1127a47b8ecd5e2661271 Mon Sep 17 00:00:00 2001 From: Bandie Date: Thu, 1 Nov 2018 12:56:23 +0100 Subject: [PATCH 2/4] Check for dirname --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index b9b40de..c502209 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,13 @@ AM_PROG_AR AM_GNU_GETTEXT_VERSION(0.18.3) AM_GNU_GETTEXT([external]) +AC_PATH_PROG([DIRNAME],dirname) +if test -z "$DIRNAME" ; then + AC_MSG_ERROR([dirname is needed to make proper installation]) +fi +AC_DEFINE_UNQUOTED([DIRNAME], "$DIRNAME", + [path to dirname]) + AC_PATH_PROG([PO4A],po4a) if test -z "$PO4A" ; then AC_MSG_ERROR([Please install po4a before building pam_panic.]) From da6de80615e194aa6e65f7154c09a80daffa1777 Mon Sep 17 00:00:00 2001 From: Bandie Date: Thu, 1 Nov 2018 13:08:39 +0100 Subject: [PATCH 3/4] Revert "Check for dirname" This reverts commit eaba486160636c6bf9e1127a47b8ecd5e2661271. --- configure.ac | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configure.ac b/configure.ac index c502209..b9b40de 100644 --- a/configure.ac +++ b/configure.ac @@ -23,13 +23,6 @@ AM_PROG_AR AM_GNU_GETTEXT_VERSION(0.18.3) AM_GNU_GETTEXT([external]) -AC_PATH_PROG([DIRNAME],dirname) -if test -z "$DIRNAME" ; then - AC_MSG_ERROR([dirname is needed to make proper installation]) -fi -AC_DEFINE_UNQUOTED([DIRNAME], "$DIRNAME", - [path to dirname]) - AC_PATH_PROG([PO4A],po4a) if test -z "$PO4A" ; then AC_MSG_ERROR([Please install po4a before building pam_panic.]) From 254e627e1fb0a4096d240d7519b132b605a61e83 Mon Sep 17 00:00:00 2001 From: Bandie Date: Thu, 1 Nov 2018 13:09:04 +0100 Subject: [PATCH 4/4] Revert "Fixes #80" This reverts commit dc504e09403881b774efa4ef37bd07b6bcea8487. --- configure.ac | 1 - src/pam_panic/Makefile.am | 2 +- src/pam_panic/data/Makefile.am | 2 -- src/pam_panic/data/auth | 0 4 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 src/pam_panic/data/Makefile.am delete mode 100644 src/pam_panic/data/auth diff --git a/configure.ac b/configure.ac index b9b40de..7dfcde0 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,6 @@ AC_CONFIG_FILES([ po4a/Makefile src/pam_panic/Makefile src/pam_panic/man/Makefile - src/pam_panic/data/Makefile src/pam_panic_pw/Makefile src/pam_panic_pw/man/Makefile src/pam_panic_config/Makefile diff --git a/src/pam_panic/Makefile.am b/src/pam_panic/Makefile.am index 3873cfd..32ff1d2 100644 --- a/src/pam_panic/Makefile.am +++ b/src/pam_panic/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = man data +SUBDIRS = man securelibdir = $(SECUREDIR) securelibexecdir = $(securelibdir) diff --git a/src/pam_panic/data/Makefile.am b/src/pam_panic/data/Makefile.am deleted file mode 100644 index dd5befb..0000000 --- a/src/pam_panic/data/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -authdir = $$(dirname $(PPASSFILE)) -auth_DATA = auth diff --git a/src/pam_panic/data/auth b/src/pam_panic/data/auth deleted file mode 100644 index e69de29..0000000