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

[svn-commits at lists.digium.com]

Author: file
Date: Sat Dec 30 13:13:19 2006
New Revision: 1775

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1775
Log:
Merged revisions 1774 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1774 | file | 2006-12-30 14:11:42 -0500 (Sat, 30 Dec 2006) | 10 lines

Merged revisions 1773 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1773 | file | 2006-12-30 14:09:50 -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 #8671 reported by djflux)

........

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

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Sat Dec 30 13:13:19 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=1775&r1=1774&r2=1775
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Dec 30 13:13:19 2006
@@ -409,7 +409,7 @@
 		$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER)
 	$(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
 		$(LIB_DIR)/$(LTZ_SO)
-	if [ -z "$(INSTALL_PREFIX)" ] && [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
+	if [ -z "$(INSTALL_PREFIX)" ] && [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then /sbin/restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
 
 install-include:
 	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h