summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-12-04 19:34:41 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-12-04 19:34:41 +0000
commitd26090b6de9245a6841fc18ef3ef0e621e0781cd (patch)
tree922fc8d6eb920f6e5e6eb85d9d01e21ab5aad6f1 /Makefile
parent7e643dc9111ab06ffad93f38ac796d5ff717ec36 (diff)
Merged revisions 848-850 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r849 | kpfleming | 2005-12-04 13:12:04 -0600 (Sun, 04 Dec 2005) | 2 lines add support for Gentoo modules.d directory ........ r850 | kpfleming | 2005-12-04 13:29:27 -0600 (Sun, 04 Dec 2005) | 2 lines make Gentoo support actually work... ........ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@851 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 84f3663..092587f 100644
--- a/Makefile
+++ b/Makefile
@@ -59,11 +59,15 @@ ifeq ($(BUILDVER),linux26)
ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
else
- ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
- MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
+ ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.d))
+ MODCONF:=$(ROOT_PREFIX)/etc/modules.d/zaptel
else
- ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
- MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
+ ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
+ MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
+ else
+ ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
+ MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
+ endif
endif
endif
endif