Browse code

- added install-modules-doc && install-modules-all (==modules+doc) - removed README.cfg from the installed docs - updated debs (now each extra module installs its doc in its own doc dir) - changed ver to rc7 (because of the lookup fix)

Andrei Pelinescu-Onciul authored on 29/08/2003 12:01:29
Showing 3 changed files
... ...
@@ -24,6 +24,8 @@
24 24
 #               in the cfg (re: /usr/.*lib/ser/modules)
25 25
 #              ser.cfg.default is installed only if there is a previous
26 26
 #               cfg. -- fixes packages containing ser.cfg.default (andrei)
27
+#  2003-08-29  install-modules-doc split from install-doc, added 
28
+#               install-modules-all, removed README.cfg (andrei)
27 29
 #
28 30
 
29 31
 auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
... ...
@@ -271,9 +273,10 @@ install-modules: modules $(modules-prefix)/$(modules-dir)
271 273
 	done 
272 274
 
273 275
 
274
-install-doc: $(doc-prefix)/$(doc-dir)
275
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README.cfg 
276
-	$(INSTALL-DOC) README.cfg $(doc-prefix)/$(doc-dir)
276
+install-modules-all: install-modules install-modules-doc
277
+
278
+
279
+install-doc: $(doc-prefix)/$(doc-dir) install-modules-doc
277 280
 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/INSTALL 
278 281
 	$(INSTALL-DOC) INSTALL $(doc-prefix)/$(doc-dir)
279 282
 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README-MODULES 
... ...
@@ -282,6 +285,11 @@ install-doc: $(doc-prefix)/$(doc-dir)
282 285
 	$(INSTALL-DOC) AUTHORS $(doc-prefix)/$(doc-dir)
283 286
 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/NEWS
284 287
 	$(INSTALL-DOC) NEWS $(doc-prefix)/$(doc-dir)
288
+	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README 
289
+	$(INSTALL-DOC) README $(doc-prefix)/$(doc-dir)
290
+
291
+
292
+install-modules-doc: $(doc-prefix)/$(doc-dir)
285 293
 	-@for r in $(modules_basenames) "" ; do \
286 294
 		if [ -n "$$r" ]; then \
287 295
 			if [ -f modules/"$$r"/README ]; then \
... ...
@@ -293,8 +301,7 @@ install-doc: $(doc-prefix)/$(doc-dir)
293 301
 			fi ; \
294 302
 		fi ; \
295 303
 	done 
296
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README 
297
-	$(INSTALL-DOC) README $(doc-prefix)/$(doc-dir)
304
+
298 305
 
299 306
 install-man: $(man-prefix)/$(man-dir)/man8 $(man-prefix)/$(man-dir)/man5
300 307
 	$(INSTALL-TOUCH)  $(man-prefix)/$(man-dir)/man8/ser.8 
... ...
@@ -40,7 +40,7 @@ export makefile_defs
40 40
 VERSION = 0
41 41
 PATCHLEVEL = 8
42 42
 SUBLEVEL =   11
43
-EXTRAVERSION = rc6
43
+EXTRAVERSION = rc7
44 44
 
45 45
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
46 46
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
... ...
@@ -10,6 +10,8 @@
10 10
 #              some ser make options (andrei)
11 11
 #  2003-06-27  changed to DH_COMPAT 4 (debian/compat) + other filenames
12 12
 #              & small fixes (andrei)
13
+#  2003-08-29  replaced modules-install with modules-install-all, to 
14
+#               install also the modules doc (andrei)
13 15
 
14 16
 
15 17
 # Uncomment this to turn on verbose mode.
... ...
@@ -95,23 +97,26 @@ install: build
95 97
 		cfg-prefix=$(CURDIR)/debian/ser \
96 98
 		cfg-target=/etc/ser/
97 99
 	# install only the mysql module
98
-	$(MAKE) install-modules modules="$(MYSQL_MOD_PATH)"  \
100
+	$(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)"  \
99 101
 		basedir=$(CURDIR)/debian/ser-mysql-module \
100 102
 		prefix=/usr \
101 103
 		cfg-prefix=$(CURDIR)/debian/ser-mysql-module \
102
-		cfg-target=/etc/ser/
104
+		cfg-target=/etc/ser/ \
105
+		doc-dir=share/doc/ser-mysql-module
103 106
 	#install only the jabber module
104
-	$(MAKE) install-modules modules="$(JABBER_MOD_PATH)"  \
107
+	$(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)"  \
105 108
 		basedir=$(CURDIR)/debian/ser-jabber-module \
106 109
 		prefix=/usr \
107 110
 		cfg-prefix=$(CURDIR)/debian/ser-jabber-module \
108
-		cfg-target=/etc/ser/
111
+		cfg-target=/etc/ser/ \
112
+		doc-dir=share/doc/ser-jabber-module
109 113
 	#install only the radius modules
110
-	$(MAKE) install-modules modules="$(RADIUS_MOD_PATH)"  \
114
+	$(MAKE) install-modules-all modules="$(RADIUS_MOD_PATH)"  \
111 115
 		basedir=$(CURDIR)/debian/ser-radius-modules \
112 116
 		prefix=/usr \
113 117
 		cfg-prefix=$(CURDIR)/debian/ser-radius-modules \
114
-		cfg-target=/etc/ser/
118
+		cfg-target=/etc/ser/ \
119
+		doc-dir=share/doc/ser-radius-modules
115 120
 	#dh_movefiles
116 121
 
117 122