[svn-commits] trunk r1034 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue May  9 06:47:48 2006
New Revision: 1034

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

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Tue May  9 06:47:48 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1034&r1=1033&r2=1034&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue May  9 06:47:48 2006
@@ -423,8 +423,9 @@
 				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 \