Fix bugs in modules-readm target.

(cherry picked from commit 0042b94)

Author: bogdan-iancu

Makefile

@@ -121,8 +121,6 @@ modules_names=$(patsubst modules/%, %.so, $(modules))
 modules_basenames=$(patsubst modules/%, %, $(modules))
 modules_full_path=$(join $(modules), $(addprefix /, $(modules_names)))
 
-doc_modules_basenames=$(patsubst modules/%, %, $(patsubst net/%, %, $(doc_modules)))
-
 ALLDEP=Makefile Makefile.sources Makefile.defs Makefile.rules Makefile.conf
 
 
@@ -239,18 +237,14 @@ tool-xsltproc:
 .PHONY: modules-readme
 modules-readme: tool-lynx tool-xsltproc
 	@set -e; \
-	for r in $(doc_modules_basenames) ""; do \
-		if [ ! -d "modules/$$r/doc" -a ! -d "net/$$r/doc" ]; then \
+	for mod in $(doc_modules); do \
+		r=`basename $$mod`;\
+		echo "Reading directory $$mod for module $$r";\
+		if [ ! -d "$$mod/doc" ]; then \
 			continue; \
 		fi; \
-		if [ -d "modules/$$r/doc" ]; then \
-			cd "modules/$$r/doc"; \
-		elif [ -d "net/$$r/doc" ]; then \
-			cd "net/$$r/doc"; \
-		fi; \
-		\
+		cd "$$mod/doc"; \
 		if [ -f "$$r".xml ]; then \
-			echo ""; \
 			echo "docbook xml to html: $$r.xml"; \
 			$(DBXML2HTML) -o $$r.html $(DBXML2HTMLPARAMS) $(DBHTMLXSL) \
 						$$r.xml; \
@@ -267,16 +261,13 @@ modules-readme: tool-lynx tool-xsltproc
 .PHONY: modules-docbook-txt
 modules-docbook-txt: tool-lynx tool-xsltproc
 	@set -e; \
-	for r in $(doc_modules_basenames) ""; do \
-		if [ ! -d "modules/$$r/doc" -a ! -d "net/$$r/doc" ]; then \
+	for mod in $(doc_modules); do \
+		r=`basename $$mod`;\
+		echo "Reading directory $$mod for module $$r";\
+		if [ ! -d "$$mod/doc" ]; then \
 			continue; \
 		fi; \
-		if [ -d "modules/$$r/doc" ]; then \
-			cd "modules/$$r/doc"; \
-		elif [ -d "net/$$r/doc" ]; then \
-			cd "net/$$r/doc"; \
-		fi; \
-		\
+		cd "$$mod/doc"; \
 		if [ -f "$$r".xml ]; then \
 			echo ""; \
 			echo "docbook xml to html: $$r.xml"; \
@@ -293,16 +284,13 @@ modules-docbook-txt: tool-lynx tool-xsltproc
 .PHONY: modules-docbook-html
 modules-docbook-html: tool-xsltproc
 	@set -e; \
-	for r in $(doc_modules_basenames) ""; do \
-		if [ ! -d "modules/$$r/doc" -a ! -d "net/$$r/doc" ]; then \
+	for mod in $(doc_modules); do \
+		r=`basename $$mod`;\
+		echo "Reading directory $$mod for module $$r";\
+		if [ ! -d "$$mod/doc" ]; then \
 			continue; \
 		fi; \
-		if [ -d "modules/$$r/doc" ]; then \
-			cd "modules/$$r/doc"; \
-		elif [ -d "net/$$r/doc" ]; then \
-			cd "net/$$r/doc"; \
-		fi; \
-		\
+		cd "$$mod/doc"; \
 		if [ -f "$$r".xml ]; then \
 			echo ""; \
 			echo "docbook xml to html: $$r.xml"; \
@@ -316,15 +304,13 @@ modules-docbook-html: tool-xsltproc
 .PHONY: modules-docbook-pdf
 modules-docbook-pdf: tool-docbook2pdf
 	@set -e; \
-	for r in $(doc_modules_basenames) ""; do \
-		if [ ! -d "modules/$$r/doc" -a ! -d "net/$$r/doc" ]; then \
+	for mod in $(doc_modules); do \
+		r=`basename $$mod`;\
+		echo "Reading directory $$mod for module $$r";\
+		if [ ! -d "$$mod/doc" ]; then \
 			continue; \
 		fi; \
-		if [ -d "modules/$$r/doc" ]; then \
-			cd "modules/$$r/doc"; \
-		elif [ -d "net/$$r/doc" ]; then \
-			cd "net/$$r/doc"; \
-		fi; \
+		cd "$$mod/doc"; \
 		if [ -f "$$r".xml ]; then \
 			echo ""; \
 			echo "docbook xml to pdf: $$r.xml"; \

Makefile.rules

@@ -16,7 +16,7 @@ builtin_modules=$(shell [ -d net ] && ls net | grep ^proto_ )
 all_nostatic_modules=$(filter-out $(addprefix modules/, $(static_modules)), \
 			$(wildcard modules/*))
 all_modules:=$(addprefix modules/, $(all_modules))
-all_modules:="$(addprefix net/, $(builtin_modules)) $all_modules"
+all_modules:=$(addprefix net/, $(builtin_modules)) $(all_modules)
 all_utils:=$(addprefix utils/, $(all_utils))
 
 #implicit rules