[zaptel-commits] russell: trunk r1577 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: russell
Date: Thu Nov  9 10:01:57 2006
New Revision: 1577

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

........
r1576 | russell | 2006-11-09 10:58:37 -0500 (Thu, 09 Nov 2006) | 3 lines

fix an expression in the install target
(issue #8321, tzafrir)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Nov  9 10:01:57 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=1577&r1=1576&r2=1577
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Nov  9 10:01:57 2006
@@ -408,7 +408,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 restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
 
 install-include:
 	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h