diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-22 23:12:07 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-22 23:12:07 +0000 |
commit | 9ed7100299999ec8bfb0c62467f3362627a9f9c5 (patch) | |
tree | ddfd5680291099b1614f7c136a62890bf95f5578 /Makefile | |
parent | 117fcbf3e26236b41ec3fb932e4f73b4b34f289e (diff) |
Merged revisions 1079 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1079 | kpfleming | 2006-05-22 18:11:36 -0500 (Mon, 22 May 2006) | 4 lines
make a backup even when modifying non-combined rules files
generate a warning about editing non-combined rules files
ensure that the warning is the last output from the 'make install' process
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1080 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -356,12 +356,12 @@ endif install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8 install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8 + [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : + [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE) build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))" - if [ -d /etc/modutils ]; then \ + @if [ -d /etc/modutils ]; then \ /sbin/update-modules ; \ fi - [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : - [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE) install-udev: devices |