--- Makefile.orig	2005-11-29 10:24:39.000000000 -0800
+++ Makefile	2006-08-06 15:21:13.072311000 -0700
@@ -55,7 +55,7 @@
 CFLAGS+=
 
 ifndef WITHOUT_ZAPTEL
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/include/zaptel.h),)
   CFLAGS+=-DZAPATA_MOH
 endif
 endif # WITHOUT_ZAPTEL
@@ -76,7 +76,7 @@
 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
 	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-	@if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \
+	@if [ "x`which mpg123 2>/dev/null | grep -v '^no'`" != x ] ; then \
 	  if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \
 			echo "*************************************************************";\
 			echo "*** You have the WRONG version of mpg123... you need .59r ***";\