From 708e3027f5293f3c7cf7edff48ad3ef73c918809 Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Wed, 17 Jul 2013 23:51:54 -0400
Subject: [PATCH] Revert "[libfko] Have 'make install' run ldconfig if basic
 fwknop/fwknopd -h exec fails"

This reverts commit f55b89c867ab63aaf69daae0aec0c19f1c52d521.

Damien recommended not having 'make install' run ldconfig since it breaks an RPM
build of fwknop, and most package managers should be doing this step anyway.
---
 CREDITS     |  3 ---
 Makefile.am | 11 -----------
 2 files changed, 14 deletions(-)

diff --git a/CREDITS b/CREDITS
index 35d19688..0ffbeb6f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -115,9 +115,6 @@ George Herlin
       test suite operate equivalently regardless of whether valgrind is used or
       whether fwknop is being tested on an embedded system with very limited
       resources.
-    - Suggested that 'make install' run ldconfig since on some systems it
-      appears that ldconfig is not automatically run via the autoconf generated
-      Makefile configs.
 
 Ruhsam Bernhard
     - Reported an issue where the message size test would result in long
diff --git a/Makefile.am b/Makefile.am
index b954958c..cbbab743 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -346,14 +346,3 @@ install-exec-hook:
 	if test -f $(DESTDIR)$(sysconfdir)/fwknop/access.conf; then \
 		chmod 600 $(DESTDIR)$(sysconfdir)/fwknop/access.conf; \
 	fi
-	if test -f $(DESTDIR)$(bindir)/fwknop; then \
-		if ! $(DESTDIR)$(bindir)/fwknop -h > /dev/null 2>&1; then \
-			ldconfig; \
-		fi \
-	else \
-		if test -f $(DESTDIR)$(sbindir)/fwknopd; then \
-			if ! $(DESTDIR)$(sbindir)/fwknopd -h > /dev/null 2>&1; then \
-				ldconfig -v; \
-			fi \
-		fi \
-	fi