[GRASS-SVN] r33981 - in grass/trunk: . include/Make man

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-10-22 12:16:13 -0400 (Wed, 22 Oct 2008)
New Revision: 33981

Added:
   grass/trunk/man/
   grass/trunk/man/Makefile
Removed:
   grass/trunk/man/Makefile
Modified:
   grass/trunk/Makefile
   grass/trunk/include/Make/DB.make
   grass/trunk/include/Make/Multi.make
Log:
Create manpages for DBMI drivers and multi-module directories
Reinstate man/Makefile to create remaining manpages (e.g. for indices)


Modified: grass/trunk/Makefile
===================================================================
--- grass/trunk/Makefile	2008-10-22 16:01:03 UTC (rev 33980)
+++ grass/trunk/Makefile	2008-10-22 16:16:13 UTC (rev 33981)
@@ -51,6 +51,7 @@
 	visualization \
 	locale \
 	tools \
+	man \
 	gem \
 	macosx
 
@@ -85,7 +86,6 @@
 	done
 	-cp -f $(FILES) ${ARCH_DISTDIR}/
 	-cp -f ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} ${ARCH_DISTDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp
-	@(cd tools ; sh -c "./build_html_index.sh")
 	@if [ `cat "$(ERRORLOG)" | wc -l` -gt 5 ] ; then \
 		echo "--"     >> $(ERRORLOG) ; \
 		echo "In case of errors please change into the directory with error and run 'make'." >> $(ERRORLOG) ; \

Modified: grass/trunk/include/Make/DB.make
===================================================================
--- grass/trunk/include/Make/DB.make	2008-10-22 16:01:03 UTC (rev 33980)
+++ grass/trunk/include/Make/DB.make	2008-10-22 16:16:13 UTC (rev 33981)
@@ -12,7 +12,7 @@
 
 dbmi: $(DBDRIVERDIR)/$(PGM)$(EXE) db_html
 
-db_html: $(HTMLDIR)/grass-$(PGM).html
+db_html: $(HTMLDIR)/grass-$(PGM).html $(MANDIR)/grass-$(PGM).$(MANSECT)
 
 $(DBDRIVERDIR)/$(PGM)$(EXE): $(ARCH_OBJS) $(DEPENDENCIES)
 	$(call linker)

Modified: grass/trunk/include/Make/Multi.make
===================================================================
--- grass/trunk/include/Make/Multi.make	2008-10-22 16:01:03 UTC (rev 33980)
+++ grass/trunk/include/Make/Multi.make	2008-10-22 16:16:13 UTC (rev 33981)
@@ -8,12 +8,13 @@
 
 PROGFILES = $(patsubst %,$(BIN)/%$(EXE),$(PROGRAMS))
 HTMLFILES = $(patsubst %,$(HTMLDIR)/%.html,$(PROGRAMS))
+MANFILES  = $(patsubst %,$(MANDIR)/%.$(MANSECT),$(PROGRAMS))
 
 multi: progs htmlmulti
 
 progs: $(PROGFILES)
 
-htmlmulti: $(HTMLFILES)
+htmlmulti: $(HTMLFILES) $(MANFILES)
 
 $(BIN)/%$(EXE): $(DEPENDENCIES)
 	$(call linker)

Copied: grass/trunk/man (from rev 33829, grass/trunk/man)

Deleted: grass/trunk/man/Makefile
===================================================================
--- grass/trunk/man/Makefile	2008-10-12 01:04:04 UTC (rev 33829)
+++ grass/trunk/man/Makefile	2008-10-22 16:16:13 UTC (rev 33981)
@@ -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)
-

Copied: grass/trunk/man/Makefile (from rev 33829, grass/trunk/man/Makefile)
===================================================================
--- grass/trunk/man/Makefile	                        (rev 0)
+++ grass/trunk/man/Makefile	2008-10-22 16:16:13 UTC (rev 33981)
@@ -0,0 +1,7 @@
+MODULE_TOPDIR = ..
+
+include $(MODULE_TOPDIR)/include/Make/Other.make
+
+MANPAGES := $(patsubst $(HTMLDIR)/%.html,$(MANDIR)/%.$(MANSECT),$(wildcard $(HTMLDIR)/*.html))
+
+default: $(MANPAGES)