[GRASS-SVN] r64581 - grass/branches/releasebranch_7_0/scripts/g.extension

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-02-11 23:22:24 -0800 (Wed, 11 Feb 2015)
New Revision: 64581

Modified:
   grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py
Log:
g.extension (bugfix): fix man dir handling (MANDIR -> MANBASEDIR)
             check Module.make and suggest solution (missing grass-dev package)
             (merge r64534:5 from trunk)


Modified: grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py	2015-02-12 07:21:05 UTC (rev 64580)
+++ grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py	2015-02-12 07:22:24 UTC (rev 64581)
@@ -746,7 +746,7 @@
              'docs'    : os.path.join(TMPDIR, name, 'docs'),
              'html'    : os.path.join(TMPDIR, name, 'docs', 'html'),
              'rest'    : os.path.join(TMPDIR, name, 'docs', 'rest'),
-             'man'     : os.path.join(TMPDIR, name, 'docs', 'man', 'man1'),
+             'man'     : os.path.join(TMPDIR, name, 'docs', 'man'),
              'script'  : os.path.join(TMPDIR, name, 'scripts'),
 ### TODO: handle locales also for addons
 #             'string'  : os.path.join(TMPDIR, name, 'locale'),
@@ -760,7 +760,7 @@
                'BIN=%s' % dirs['bin'],
                'HTMLDIR=%s' % dirs['html'],
                'RESTDIR=%s' % dirs['rest'],
-               'MANDIR=%s' % dirs['man'],
+               'MANBASEDIR=%s' % dirs['man'],
                'SCRIPTDIR=%s' % dirs['script'],
                'STRINGDIR=%s' % dirs['string'],
                'ETC=%s' % os.path.join(dirs['etc'])
@@ -783,6 +783,10 @@
     os.chdir(os.path.join(TMPDIR, name))
 
     grass.message(_("Compiling..."))
+    if not os.path.exists(os.path.join(gisbase, 'include',
+                                       'Make', 'Module.make')):
+        grass.fatal(_("Please install GRASS development package"))
+
     if 0 != grass.call(makeCmd,
                        stdout = outdev):
         grass.fatal(_('Compilation failed, sorry. Please check above error messages.'))