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

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-10-11 21:17:36 -0400 (Sat, 11 Oct 2008)
New Revision: 33830

Removed:
   grass/trunk/man/
Modified:
   grass/trunk/Makefile
   grass/trunk/include/Make/Grass.make
   grass/trunk/include/Make/Html.make
   grass/trunk/include/Make/NoHtml.make
   grass/trunk/include/Make/Rules.make
Log:
Remove "man" directory; generate manpages alongside HTML files in Html.make


Modified: grass/trunk/Makefile
===================================================================
--- grass/trunk/Makefile	2008-10-12 01:04:04 UTC (rev 33829)
+++ grass/trunk/Makefile	2008-10-12 01:17:36 UTC (rev 33830)
@@ -49,16 +49,16 @@
 	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 \

Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2008-10-12 01:04:04 UTC (rev 33829)
+++ grass/trunk/include/Make/Grass.make	2008-10-12 01:17:36 UTC (rev 33830)
@@ -80,6 +80,11 @@
 # 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

Modified: grass/trunk/include/Make/Html.make
===================================================================
--- grass/trunk/include/Make/Html.make	2008-10-12 01:04:04 UTC (rev 33829)
+++ grass/trunk/include/Make/Html.make	2008-10-12 01:17:36 UTC (rev 33830)
@@ -26,10 +26,13 @@
 		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
 

Modified: grass/trunk/include/Make/NoHtml.make
===================================================================
--- grass/trunk/include/Make/NoHtml.make	2008-10-12 01:04:04 UTC (rev 33829)
+++ grass/trunk/include/Make/NoHtml.make	2008-10-12 01:17:36 UTC (rev 33830)
@@ -1,3 +1,6 @@
 
 $(HTMLDIR)/$(PGM).html:
 	@echo no HTML documentation available
+
+$(MANDIR)/$(PGM).$(MANSECT):
+	@echo no manual page available

Modified: grass/trunk/include/Make/Rules.make
===================================================================
--- grass/trunk/include/Make/Rules.make	2008-10-12 01:04:04 UTC (rev 33829)
+++ grass/trunk/include/Make/Rules.make	2008-10-12 01:17:36 UTC (rev 33830)
@@ -5,7 +5,8 @@
 # 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)