summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-05-09 11:47:48 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-05-09 11:47:48 +0000
commite2bbbc6f8ffa6bf7b960dde029f7ae88d7c163d6 (patch)
treee842f6d452c3f5061467dff359ca85aea1f5198e /Makefile
parentf4f91c0ed866dd969ce68262323b4fefbbbb376c (diff)
Merged revisions 1033 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r1033 | kpfleming | 2006-05-09 06:46:50 -0500 (Tue, 09 May 2006) | 2 lines preserve 'options' settings in the module configuration file during 'make install' ........ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1034 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b07bc04..9b1230f 100644
--- a/Makefile
+++ b/Makefile
@@ -423,8 +423,9 @@ install: all devices
echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
fi; \
else \
+ grep "^options" $(MODCONF) > $(MODCONF).new; \
rm -f $(MODCONF) $(MODCONF).bak; \
- touch $(MODCONF); \
+ mv $(MODCONF).new $(MODCONF); \
fi; \
for x in $(MODULES); do \
if ! grep -q "post-install $$x" $(MODCONF); then \