diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-05-21 17:56:51 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-05-21 17:56:51 +0000 |
| commit | edfd73987bfdd47cad0ebbba9f6dfcda3a5cc8b0 (patch) | |
| tree | 94ecad12d9e0a6473312b3567da55445070f8444 | |
| parent | 0e3e2b49d1d23d516c4936ebcb4d2fef40a13f56 (diff) | |
restore support for /etc/conf.modules
don't call ldconfig, it's unnecessary
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@651 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rwxr-xr-x | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -58,10 +58,14 @@ endif 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: all devices 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" | \ |