[GRASS-SVN] r49908 - in grass/trunk: include/Make man scripts/g.manual

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-25 14:56:32 -0800 (Sun, 25 Dec 2011)
New Revision: 49908

Modified:
   grass/trunk/include/Make/Grass.make
   grass/trunk/man/Makefile
   grass/trunk/scripts/g.manual/g.manual.py
Log:
install manual pages to `docs/man` instead of `man`


Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2011-12-25 22:42:57 UTC (rev 49907)
+++ grass/trunk/include/Make/Grass.make	2011-12-25 22:56:32 UTC (rev 49908)
@@ -96,7 +96,7 @@
 YFLAGS      = -d -v
 
 MANSECT = 1
-MANBASEDIR = $(ARCH_DISTDIR)/man
+MANBASEDIR = $(ARCH_DISTDIR)/docs/man
 MANDIR = $(MANBASEDIR)/man$(MANSECT)
 HTML2MAN = VERSION_NUMBER=$(GRASS_VERSION_NUMBER) $(GISBASE)/tools/g.html2man.py
 

Modified: grass/trunk/man/Makefile
===================================================================
--- grass/trunk/man/Makefile	2011-12-25 22:42:57 UTC (rev 49907)
+++ grass/trunk/man/Makefile	2011-12-25 22:56:32 UTC (rev 49908)
@@ -10,7 +10,6 @@
 	$(HTMLDIR)/grass_icon.png \
 	$(HTMLDIR)/nviz/grassdocs.css \
 	$(HTMLDIR)/nviz/grass_logo.png \
-	$(GEM_DST)
 
 categories = \
 	d:display \

Modified: grass/trunk/scripts/g.manual/g.manual.py
===================================================================
--- grass/trunk/scripts/g.manual/g.manual.py	2011-12-25 22:42:57 UTC (rev 49907)
+++ grass/trunk/scripts/g.manual/g.manual.py	2011-12-25 22:56:32 UTC (rev 49908)
@@ -60,7 +60,7 @@
     grass.fatal(_("Error starting browser <%s> for HTML file <%s>") % (browser, entry))
     
 def start_man(entry):
-    path = os.path.join(gisbase, 'man', 'man1', entry + '.1')
+    path = os.path.join(gisbase, 'docs', 'man', 'man1', entry + '.1')
     if not os.path.exists(path) and os.getenv('GRASS_ADDON_PATH'):
         path = os.path.join(os.getenv('GRASS_ADDON_PATH'), 'man', 'man1', entry + '.1')