[GRASS-SVN] r51369 - grass/trunk/scripts/g.extension

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-04-10 15:25:10 -0700 (Tue, 10 Apr 2012)
New Revision: 51369

Modified:
   grass/trunk/scripts/g.extension/g.extension.py
Log:
g.extension: install manual pages into `docs` directory


Modified: grass/trunk/scripts/g.extension/g.extension.py
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.py	2012-04-10 22:23:43 UTC (rev 51368)
+++ grass/trunk/scripts/g.extension/g.extension.py	2012-04-10 22:25:10 UTC (rev 51369)
@@ -708,20 +708,19 @@
                    url], stdout = outdev) != 0:
         grass.fatal(_("GRASS Addons <%s> not found") % name)
     
-    dirs = { 'bin' : os.path.join(tmpdir, name, 'bin'),
-             'docs' : os.path.join(tmpdir, name, 'docs'),
-             'html' : os.path.join(tmpdir, name, 'docs', 'html'),
-             'man' : os.path.join(tmpdir, name, 'man'),
-             'man1' : os.path.join(tmpdir, name, 'man', 'man1'),
+    dirs = { 'bin'     : os.path.join(tmpdir, name, 'bin'),
+             'docs'    : os.path.join(tmpdir, name, 'docs'),
+             'html'    : os.path.join(tmpdir, name, 'docs', 'html'),
+             'man'     : os.path.join(tmpdir, name, 'docs', 'man', 'man1'),
              'scripts' : os.path.join(tmpdir, name, 'scripts'),
-             'etc' : os.path.join(tmpdir, name, 'etc'),
+             'etc'     : os.path.join(tmpdir, name, 'etc'),
              }
     
     makeCmd = ['make',
                'MODULE_TOPDIR=%s' % gisbase.replace(' ', '\ '),
                'BIN=%s' % dirs['bin'],
                'HTMLDIR=%s' % dirs['html'],
-               'MANDIR=%s' % dirs['man1'],
+               'MANDIR=%s' % dirs['man'],
                'SCRIPTDIR=%s' % dirs['scripts'],
                'ETC=%s' % os.path.join(dirs['etc'],name)
                ]
@@ -841,7 +840,7 @@
     for fpath in [os.path.join(options['prefix'], 'bin', name),
                   os.path.join(options['prefix'], 'scripts', name),
                   os.path.join(options['prefix'], 'docs', 'html', name + '.html'),
-                  os.path.join(options['prefix'], 'man', 'man1', name + '.1')]:
+                  os.path.join(options['prefix'], 'docs', 'man', 'man1', name + '.1')]:
         if os.path.isfile(fpath):
             if force:
                 grass.verbose(fpath)
@@ -919,7 +918,7 @@
     check_style_files('grass_logo.png')
     check_style_files('grassdocs.css')
     create_dir(os.path.join(options['prefix'], 'etc'))
-    create_dir(os.path.join(options['prefix'], 'man', 'man1'))
+    create_dir(os.path.join(options['prefix'], 'docs', 'man', 'man1'))
     create_dir(os.path.join(options['prefix'], 'scripts'))
 
 def main():