[libpri-commits] trunk r333 - in /trunk: ./ Makefile

[libpri-commits at lists.digium.com]

Author: kpfleming
Date: Sun Apr 30 10:20:00 2006
New Revision: 333

URL: http://svn.digium.com/view/libpri?rev=333&view=rev
Log:
Merged revisions 316,323,327,332 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.2

........
r332 | kpfleming | 2006-04-30 10:17:47 -0500 (Sun, 30 Apr 2006) | 3 lines

set LDCONFIG_FLAGS for GNU/kFreeBSD as well
use the flags during installation

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Sun Apr 30 10:20:00 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-311
+/branches/1.2:1-332

Modified: trunk/Makefile
URL: http://svn.digium.com/view/libpri/trunk/Makefile?rev=333&r1=332&r2=333&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Apr 30 10:20:00 2006
@@ -43,7 +43,7 @@
 INSTALL_BASE=/usr
 SOFLAGS = -Wl,-hlibpri.so.1.0
 LDCONFIG = /sbin/ldconfig
-ifeq (${OSARCH},Linux)
+ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD))
 LDCONFIG_FLAGS=-n
 else
 ifeq (${OSARCH},FreeBSD)
@@ -89,7 +89,7 @@
 	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then  restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
 	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
 	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-	if test $$(id -u) = 0; then $(LDCONFIG); fi
+	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
 else
 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)