Remove "man" directory; generate manpages alongside HTML files in Html.make

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33830 15284696-431f-4ddb-bdfa-cd5b030d7da7

Makefile

@@ -49,16 +49,16 @@ DIRS = \
 	doc \
 	gui \
 	visualization \
+	locale \
 	tools \
 	gem \
-	man \
-	locale \
 	macosx
 
 SUBDIRS = $(DIRS)
 
 FILES = AUTHORS COPYING CHANGES REQUIREMENTS.html GPL.TXT
 
+# why no locale directory?
 BIN_DIST_FILES = $(FILES) \
 	grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp \
 	bin \

include/Make/Grass.make

@@ -80,6 +80,11 @@ LFLAGS      = -s
 # parser generator and default options
 YFLAGS      = -d -v
 
+MANSECT = 1
+MANBASEDIR = $(ARCH_DISTDIR)/man
+MANDIR = $(MANBASEDIR)/man$(MANSECT)
+HTML2MAN = VERSION_NUMBER=${GRASS_VERSION_NUMBER} $(GRASS_HOME)/tools/g.html2man/g.html2man.py
+
 ##################### library names #####################################
 
 ARRAYSTATS_LIBNAME        = grass_arraystats

include/Make/Html.make

@@ -26,10 +26,13 @@ $(HTMLDIR)/%.html: %.html %.tmp.html $(HTMLSRC)
 		fi \
 		done 2> /dev/null ; true
 
+$(MANDIR)/%.$(MANSECT): $(HTMLDIR)/%.html
+	$(HTML2MAN) $< $@
+
 %.tmp.html: $(HTMLSRC)
 	if [ "$(HTMLSRC)" != "" ] ; then $(call htmldesc,$<,$@) ; fi
 
-html: $(HTMLDIR)/$(PGM).html
+html: $(HTMLDIR)/$(PGM).html $(MANDIR)/$(PGM).$(MANSECT)
 
 endif
 

include/Make/NoHtml.make

@@ -1,3 +1,6 @@
 
 $(HTMLDIR)/$(PGM).html:
 	@echo no HTML documentation available
+
+$(MANDIR)/$(PGM).$(MANSECT):
+	@echo no manual page available

include/Make/Rules.make

@@ -5,7 +5,8 @@ first: pre default
 # create platform dirs 
 ARCH_DIRS = $(ARCH_DISTDIR) $(ARCH_BINDIR) $(ARCH_INCDIR) $(ARCH_LIBDIR) \
 	$(BIN) $(ETC) \
-	$(DRIVERDIR) $(DBDRIVERDIR) $(FONTDIR) $(DOCSDIR) $(HTMLDIR)
+	$(DRIVERDIR) $(DBDRIVERDIR) $(FONTDIR) $(DOCSDIR) $(HTMLDIR) \
+	$(MANBASEDIR) $(MANDIR)
 
 pre: $(ARCH_DIRS)
 

man/Makefile

@@ -1,23 +0,0 @@
-MODULE_TOPDIR = ..
-
-include $(MODULE_TOPDIR)/include/Make/Dir.make
-
-# some definitions
-SECT = 1
-MANDIR  = $(ARCH_DISTDIR)/man/man$(SECT)
-HTML2MAN = VERSION_NUMBER=${GRASS_VERSION_NUMBER} $(GRASS_HOME)/tools/g.html2man/g.html2man.py
-
-MANPAGES := $(patsubst $(HTMLDIR)/%.html,$(MANDIR)/%.$(SECT),$(wildcard $(HTMLDIR)/*.html))
-
-default: $(MANPAGES)
-
-$(MANDIR):
-	$(MKDIR) $(MANDIR)
-
-ifneq ($(BROKEN_MAKE),)
-$(MANDIR)/%.$(SECT): $(HTMLDIR)/%.html $(MANDIR)
-else
-$(MANDIR)/%.$(SECT): $(HTMLDIR)/%.html | $(MANDIR)
-endif
-	$(HTML2MAN) $< $@ $(SECT)
-