diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-16 13:45:14 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-16 13:45:14 +0000 |
commit | c15a2f570056b106eb66edf2221b1036835ae108 (patch) | |
tree | e202ce3c0d22736bab5042eb7df319d8dec4119c /Makefile | |
parent | 90767d49661f28c09e68dc4ca62e9a61b8c9b95f (diff) |
Merged revisions 1060 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1060 | kpfleming | 2006-05-16 08:43:41 -0500 (Tue, 16 May 2006) | 4 lines
ensure that PWD is set early enough for 'make install' to actually work
use proper KERNEL matching syntax for udev rules
don't install udev rules as mode 0444; there is no need to make them read-only
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1061 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -7,6 +7,7 @@ .EXPORT_ALL_VARIABLES: BASEADDR=0xd0000 +PWD:=$(shell pwd) HOSTCC=gcc ifeq ($(DEB_HOST_GNU_TYPE),) @@ -197,7 +198,6 @@ UTILSO:=$(UTILS:%=%.o) #PRIMARY=wcfxsusb PRIMARY=torisa #PRIMARY=wcfxo -PWD:=$(shell pwd) all: modules $(LIBTONEZONE_SO) @@ -354,10 +354,10 @@ ifndef DYNFS else # DYNFS ifdef UDEVRULES ifdef UDEVPERMISSIONS - install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d - install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d + install -m 666 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d + install -m 666 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d else # !UDEVPERMISSIONS (newer, combined syntax) - install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules + install -m 666 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules endif else # !UDEVRULES @echo "**** Dynamic filesystem detected -- not creating device nodes" @@ -454,10 +454,10 @@ install: all devices install-udev: ifdef UDEVRULES ifdef UDEVPERMISSIONS - install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d - install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d + install -m 666 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d + install -m 666 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d else # !UDEVPERMISSIONS (newer, combined syntax) - install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules + install -m 666 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules endif endif |