[zaptel-commits] trunk - r851 in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Sun Dec  4 13:34:41 2005
New Revision: 851

URL: http://svn.digium.com/view/zaptel?rev=851&view=rev
Log:
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...

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Dec  4 13:34:41 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-843
+/branches/1.2:1-850

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=851&r1=850&r2=851&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Dec  4 13:34:41 2005
@@ -59,11 +59,15 @@
   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