From fdfb0fd99bb66ef957a7405c6dd7fdc780aed8a0 Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Fri, 30 Sep 2005 15:57:03 +0000
Subject: don't try to mess with module configuration file if it's not found
 (issue #5337)

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@787 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 Makefile | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 5b8bae0..97a3938 100755
--- a/Makefile
+++ b/Makefile
@@ -332,34 +332,36 @@ install: all devices
 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
 	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
 	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-	if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi
-	cat $(MODCONF).bak | grep -v "alias char-major-250" | \
-	grep -v "post-install torisa /sbin/ztcfg" | \
-	grep -v "post-install wcfxsusb /sbin/ztcfg" | \
-	grep -v "alias wctdm" | \
-	grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF) || true
-	if ! grep "options torisa" $(MODCONF); then \
-		echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
-	fi
-	if ! grep "alias char-major-196" $(MODCONF); then \
-		echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
-	fi
-	for x in $(MODULES); do \
-		if ! grep -q "post-install $$x" $(MODCONF); then \
-			if ! grep -q "install $$x " $(MODCONF); then \
-				if [ "$$x" != "zaptel" ] ; then \
-					if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
-					else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
+	if [ -n "$(MODCONF)" ]; then \
+		if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi; \
+		cat $(MODCONF).bak | grep -v "alias char-major-250" | \
+		grep -v "post-install torisa /sbin/ztcfg" | \
+		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
+		grep -v "alias wctdm" | \
+		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
+		if ! grep "options torisa" $(MODCONF); then \
+			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
+		fi; \
+		if ! grep "alias char-major-196" $(MODCONF); then \
+			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
+		fi; \
+		for x in $(MODULES); do \
+			if ! grep -q "post-install $$x" $(MODCONF); then \
+				if ! grep -q "install $$x " $(MODCONF); then \
+					if [ "$$x" != "zaptel" ] ; then \
+						if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
+						else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
+						fi; \
 					fi; \
 				fi; \
 			fi; \
+		done; \
+		if ! grep "ias wcfxs" $(MODCONF); then \
+			echo "alias wcfxs wctdm" >> $(MODCONF); \
+		fi; \
+		if ! grep "alias wct2xxp" $(MODCONF); then \
+			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
 		fi; \
-	done
-	if ! grep "alias wcfxs" $(MODCONF); then \
-		echo "alias wcfxs wctdm" >> $(MODCONF); \
-	fi
-	if ! grep "alias wct2xxp" $(MODCONF); then \
-		echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
 	fi
 	if [ -d /etc/modutils ]; then \
 		/sbin/update-modules ; \
-- 
cgit v1.2.3