From bf75434c5f05c4b84f64d9e346756e6c99e971b0 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 2 May 2018 15:13:37 +0200
Subject: Makefile.am: Drop dist-hook. Makes localinstall configure option
 obsolete, so also removed.

---
 Makefile.am  | 29 -----------------------------
 configure.ac | 16 +---------------
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7d71690..0be6fd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,36 +1,7 @@
-
 SUBDIRS = src
 
 if HAVE_GTEST
 SUBDIRS += tests
 endif
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
-
-dist-hook:
-	@if test -d "$(top_srcdir)/.bzr"; \
-		then \
-			echo Creating ChangeLog && \
-				( cd "$(top_srcdir)" && \
-				echo '# Generated by Makefile. Do not edit.'; echo; \
-				$(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
-				&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-				|| (rm -f ChangeLog.tmp; \
-					echo Failed to generate ChangeLog >&2 ); \
-		else \
-			echo Failed to generate ChangeLog: not a branch >&2; \
-		fi
-		@if test -d "$(top_srcdir)/.bzr"; \
-			then \
-				echo Creating AUTHORS && \
-					( cd "$(top_srcdir)" && \
-					echo '# Generated by Makefile. Do not edit.'; echo; \
-					$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
-					&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
-					|| (rm -f AUTHORS.tmp; \
-						echo Failed to generate AUTHORS >&2 ); \
-			else \
-				echo Failed to generate AUTHORS: not a branch >&2; \
-	fi
-
 include $(top_srcdir)/Makefile.am.coverage
diff --git a/configure.ac b/configure.ac
index ba57d72..a8bb2d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,25 +27,11 @@ fi
 
 PKG_CHECK_MODULES(LIBSSH, libssh)
 
-###########################
-# Local Install
-###########################
-
-with_localinstall="no"
-AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall],
-                                           [install all files locally (for distcheck)]),
-              with_localinstall=$enableval,
-              with_localinstall=no)
-
 ###########################
 # PAM Module dir
 ###########################
 
-if test "x$with_localinstall" = "xyes"; then
-	PAMMODULEDIR="${libdir}/security/"
-else
-	PAMMODULEDIR="/lib/security"
-fi
+PAMMODULEDIR="/lib/security"
 AC_SUBST(PAMMODULEDIR)
 
 ###########################
-- 
cgit v1.2.3