Browse code

- removed README.cfg - renamed ser.cfg.default to ser.cfg.sample (*bsd standard for installed cfgs) - added a new make option: skip_cfg_install (usefull if you want to create packages with ser.cfg.sample isntead of ser.cfg to avoid overwriting if installing from packages)

Andrei Pelinescu-Onciul authored on 29/08/2003 16:58:39
Showing 7 changed files
... ...
@@ -26,6 +26,7 @@
26 26
 #               cfg. -- fixes packages containing ser.cfg.default (andrei)
27 27
 #  2003-08-29  install-modules-doc split from install-doc, added 
28 28
 #               install-modules-all, removed README.cfg (andrei)
29
+#              added skip_cfg_install (andrei)
29 30
 #
30 31
 
31 32
 auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
... ...
@@ -33,6 +34,11 @@ auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
33 34
 #include  source related defs
34 35
 include Makefile.sources
35 36
 
37
+# whether or not to install ser.cfg or just ser.cfg.default
38
+# (ser.cfg will never be overwritten by make install, this is usefull
39
+#  when creating packages)
40
+skip_cfg_install?=
41
+
36 42
 #extra modules to exclude
37 43
 skip_modules?=
38 44
 
... ...
@@ -237,10 +243,11 @@ $(man-prefix)/$(man-dir)/man5:
237 243
 # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
238 244
 install-cfg: $(cfg-prefix)/$(cfg-dir)
239 245
 		sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \
240
-			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.default
241
-		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.default
242
-		if [ ! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
243
-			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.default \
246
+			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
247
+		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
248
+		if [ -z "${skip_cfg_install}" -a \
249
+				! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
250
+			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
244 251
 				$(cfg-prefix)/$(cfg-dir)ser.cfg; \
245 252
 		fi
246 253
 #		$(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
... ...
@@ -31,7 +31,6 @@ lib/ser/modules/usrloc.so
31 31
 lib/ser/modules/vm.so
32 32
 lib/ser/modules/xlog.so
33 33
 share/doc/ser/README
34
-share/doc/ser/README.cfg
35 34
 share/doc/ser/INSTALL
36 35
 share/doc/ser/README-MODULES
37 36
 share/doc/ser/AUTHORS
... ...
@@ -31,7 +31,6 @@ lib/ser/modules/usrloc.so
31 31
 lib/ser/modules/vm.so
32 32
 lib/ser/modules/xlog.so
33 33
 share/doc/ser/README
34
-share/doc/ser/README.cfg
35 34
 share/doc/ser/INSTALL
36 35
 share/doc/ser/README-MODULES
37 36
 share/doc/ser/AUTHORS
... ...
@@ -31,7 +31,6 @@ lib/ser/modules/usrloc.so
31 31
 lib/ser/modules/vm.so
32 32
 lib/ser/modules/xlog.so
33 33
 share/doc/ser/README
34
-share/doc/ser/README.cfg
35 34
 share/doc/ser/INSTALL
36 35
 share/doc/ser/README-MODULES
37 36
 share/doc/ser/AUTHORS
... ...
@@ -140,7 +140,6 @@ fi
140 140
 %doc %{_docdir}/ser/README.acc
141 141
 %doc %{_docdir}/ser/README.auth
142 142
 %doc %{_docdir}/ser/README.auth_db
143
-%doc %{_docdir}/ser/README.cfg
144 143
 %doc %{_docdir}/ser/README.dbtext
145 144
 %doc %{_docdir}/ser/README.domain
146 145
 %doc %{_docdir}/ser/README.enum
... ...
@@ -232,7 +231,7 @@ fi
232 231
 
233 232
 * Wed Aug 27 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
234 233
 - changed vesion to 0.8.11
235
-- gen_ha1 isn now left in _sbindir
234
+- gen_ha1 is now left in _sbindir
236 235
 - removed harv_ser.sh
237 236
 - added xlog to the modules list
238 237
 
... ...
@@ -141,7 +141,6 @@ sbin/insserv etc/init.d/
141 141
 %doc %{_docdir}/ser/README.acc
142 142
 %doc %{_docdir}/ser/README.auth
143 143
 %doc %{_docdir}/ser/README.auth_db
144
-%doc %{_docdir}/ser/README.cfg
145 144
 %doc %{_docdir}/ser/README.dbtext
146 145
 %doc %{_docdir}/ser/README.domain
147 146
 %doc %{_docdir}/ser/README.enum
... ...
@@ -243,7 +242,7 @@ sbin/insserv etc/init.d/
243 242
 
244 243
 * Wed Aug 27 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
245 244
 - changed vesion to 0.8.11
246
-- gen_ha1 isn now left in _sbindir
245
+- gen_ha1 is now left in _sbindir
247 246
 - removed harv_ser.sh
248 247
 - added Conflicts
249 248
 
... ...
@@ -40,7 +40,6 @@ f none lib/ser/modules/vm.so 0755 bin bin
40 40
 d none doc 0755 bin bin
41 41
 d none doc/ser 0755 bin bin
42 42
 f none doc/ser/README 0644 bin bin
43
-f none doc/ser/README.cfg 0644 bin bin
44 43
 f none doc/ser/INSTALL 0644 bin bin
45 44
 f none doc/ser/README-MODULES 0644 bin bin
46 45
 f none doc/ser/AUTHORS 0644 bin bin