[svn-commits] branch 1.2 r332 - /branches/1.2/Makefile
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sun Apr 30 08:17:48 MST 2006
Author: kpfleming
Date: Sun Apr 30 10:17:47 2006
New Revision: 332
URL: http://svn.digium.com/view/libpri?rev=332&view=rev
Log:
set LDCONFIG_FLAGS for GNU/kFreeBSD as well
use the flags during installation
Modified:
branches/1.2/Makefile
Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/libpri/branches/1.2/Makefile?rev=332&r1=331&r2=332&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Sun Apr 30 10:17:47 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)
More information about the svn-commits
mailing list