[Asterisk-cvs] zaptel Makefile,1.75,1.76

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv26927

Modified Files:
	Makefile 
Log Message:
restore support for /etc/conf.modules
don't call ldconfig, it's unnecessary


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/zaptel/Makefile,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- Makefile	21 May 2005 17:49:12 -0000	1.75
+++ Makefile	21 May 2005 17:56:51 -0000	1.76
@@ -58,10 +58,14 @@
 ifeq ($(BUILDVER),linux26)
   ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
     MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
-   else
+  else
     ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
       MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
-     endif
+    else
+      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
+        MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
+      endif
+    endif
   endif
 else # BUILDVER == linux24
   ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
@@ -319,7 +323,6 @@
 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
 	rm -f $(INSTALL_PREFIX)/usr/lib/libtonezone.so
 	rm -f $(INSTALL_PREFIX)/usr/lib/libtonezone.so.1
-	[ `id -u` = 0 ] && /sbin/ldconfig || :
 	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" | \