[svn-commits] file: trunk r387 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: file
Date: Sat Dec 30 13:18:43 2006
New Revision: 387

URL: http://svn.digium.com/view/libpri?view=rev&rev=387
Log:
Merged revisions 386 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.4

................
r386 | file | 2006-12-30 14:17:34 -0500 (Sat, 30 Dec 2006) | 10 lines

Merged revisions 385 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.2

........
r385 | file | 2006-12-30 14:16:17 -0500 (Sat, 30 Dec 2006) | 2 lines

Specify full path to restorecon instead of assuming it will be available from what is in $PATH. (issue #8670 reported by djflux)

........

................

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Sat Dec 30 13:18:43 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-372
+/branches/1.4:1-372,386

Modified: trunk/Makefile
URL: http://svn.digium.com/view/libpri/trunk/Makefile?view=diff&rev=387&r1=386&r2=387
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Dec 30 13:18:43 2006
@@ -82,7 +82,7 @@
 ifneq (${OSARCH},SunOS)
 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
 	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-	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
+	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/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) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi