[SM-Commit] PERFORCE change 80610 by Juuso Alasuutari for review

Perforce Review Daemon p4review at smee.org
Tue Jun 13 15:30:01 EDT 2006


Change 80610 by juuso_alasuutari at juuso_alasuutari-kamayuq on 2006/06/13 20:25:10

	Fixed issue where config file is always overwritten.

Affected files ...

... //sgl/grimoires/devel/net/ifplugd/HISTORY#8 edit
... //sgl/grimoires/devel/net/ifplugd/INSTALL#1 add
... //sgl/grimoires/devel/net/ifplugd/PRE_BUILD#2 edit
... //sgl/grimoires/devel/net/ifplugd/conf/ifplugd.conf#1 add

Differences ...

==== //sgl/grimoires/devel/net/ifplugd/HISTORY#8 (text) ====

@@ -1,3 +1,10 @@
+2006-06-13 Juuso Alasuutari <iuso at sourcemage.org>
+	* PRE_BUILD: Hacked $SOURCE_DIRECTORY/conf/Makefile.in to not 
+	  install ifplugd.conf, we'll do that ourselves to prevent it 
+	  from being overwritten. Also pruned existing code a little.
+	* conf/ifplugd.conf: Added.
+	* INSTALL: Added, install ifplugd.conf with install_config_file.
+
 2006-04-27 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: Added a few keywords, updated PATCHLEVEL
 	* init.d/ifplugd: Fixed return value handling

==== //sgl/grimoires/devel/net/ifplugd/PRE_BUILD#2 (xtext) ====

@@ -1,3 +1,5 @@
-default_pre_build &&
+default_pre_build  &&
 
-sedit 's/^[^I]*INSTALL[^i]*ifplugd\.init.*ifplugd$/# hack to prevent ifplugd.init install/' $SOURCE_DIRECTORY/conf/Makefile.in
+# Prevent install of init script and config file
+sedit 's/^.*INSTALL.*ifplugd\.init.*$//' $SOURCE_DIRECTORY/conf/Makefile.in  &&
+sedit 's/^.*INSTALL.*ifplugd\.conf.*$//' $SOURCE_DIRECTORY/conf/Makefile.in



More information about the SM-Commit mailing list