[libfko] Have 'make install' run ldconfig if basic fwknop/fwknopd -h exec fails

This commit makes sure that if running 'fwknop -h' or 'fwknopd -h' appears to
fail then run ldconfig under the 'make install' step.  George Herlin reported
that on some systems ldconfig was not automatically getting executed via the
autoconf Makefile config, and since fwknop/fwknopd depend on a shared library
(libfko), ldconfig needs to be executed by 'make install' if it wasn't already
done.
This commit is contained in:
Michael Rash
2013-06-30 14:50:12 -04:00
parent 8ed088051e
commit f55b89c867
2 changed files with 14 additions and 0 deletions
+3
View File
@@ -115,6 +115,9 @@ 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
+11
View File
@@ -345,3 +345,14 @@ 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