[patch] zaptel-cvs-modulesd.patch

zaptel-cvs-modulesd.patch (text/plain), 1.60 KB, created by Dorian Gray on 2004-03-31 21:32:43 UTC

--- zaptel/Makefile.orig	2004-04-01 00:04:53.685599734 -0500
+++ zaptel/Makefile	2004-04-01 00:06:25.890868491 -0500
@@ -33,7 +33,8 @@
 INSTALL_PREFIX=
 
 BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi)
-MODCONF=$(shell if [ -d $(INSTALL_PREFIX)/etc/modprobe.d ]; then echo "$(INSTALL_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(INSTALL_PREFIX)/etc/modutils ]; then echo "$(INSTALL_PREFIX)/etc/modutils/zaptel"; elif [ -f $(INSTALL_PREFIX)/etc/modprobe.conf ]; then echo "$(INSTALL_PREFIX)/modprobe.conf"; elif [ -f $(INSTALL_PREFIX)/etc/modules.conf ]; then echo "$(INSTALL_PREFIX)/etc/modules.conf"; else echo $(INSTALL_PREFIX)/etc/conf.modules ; fi)
+# Patch for Gentoo, uses modules.d
+MODCONF=$(INSTALL_PREFIX)/etc/modules.d/zaptel
 
 ifeq (${BUILDVER},linux24)
 #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
@@ -264,6 +265,7 @@
 	install -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include
 	( cd $(INSTALL_PREFIX)/usr/lib ; rm -f libtonezone.so ; ln -sf $(LIBTONEZONE) libtonezone.so )
 	/sbin/ldconfig
+	mkdir -p $(INSTALL_PREFIX)/etc/modules.d
 	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" | \
@@ -288,10 +290,10 @@
 		fi; \
 	done
 
-	if [ -d /etc/modutils ]; then \
-		/sbin/update-modules ; \
-	fi
-	-/sbin/depmod -a
+	#if [ -d /etc/modutils ]; then \
+	#	/sbin/update-modules ; \
+	#fi
+	#-/sbin/depmod -a
 	[ -f $(INSTALL_PREFIX)/etc/zaptel.conf ] || install -m 644 zaptel.conf.sample $(INSTALL_PREFIX)/etc/zaptel.conf
 
 config: