[GRASS-SVN] r61600 - grass/trunk/scripts/g.extension
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 13 13:49:57 PDT 2014
Author: martinl
Date: 2014-08-13 13:49:57 -0700 (Wed, 13 Aug 2014)
New Revision: 61600
Modified:
grass/trunk/scripts/g.extension/g.extension.py
Log:
g.extension: produce full make command also for wxGUI extensions
Modified: grass/trunk/scripts/g.extension/g.extension.py
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.py 2014-08-13 20:48:17 UTC (rev 61599)
+++ grass/trunk/scripts/g.extension/g.extension.py 2014-08-13 20:49:57 UTC (rev 61600)
@@ -750,22 +750,17 @@
'etc' : os.path.join(TMPDIR, name, 'etc'),
}
- if classchar != 'wx':
- makeCmd = ['make',
- 'MODULE_TOPDIR=%s' % gisbase.replace(' ', '\ '),
- 'RUN_GISRC=%s' % os.environ['GISRC'],
- 'BIN=%s' % dirs['bin'],
- 'HTMLDIR=%s' % dirs['html'],
- 'RESTDIR=%s' % dirs['rest'],
- 'MANDIR=%s' % dirs['man'],
- 'SCRIPTDIR=%s' % dirs['scripts'],
- 'ETC=%s' % os.path.join(dirs['etc'], name)
- ]
- else:
- makeCmd = ['make',
- 'MODULE_TOPDIR=%s' % gisbase.replace(' ', '\ ')
- ]
-
+ makeCmd = ['make',
+ 'MODULE_TOPDIR=%s' % gisbase.replace(' ', '\ '),
+ 'RUN_GISRC=%s' % os.environ['GISRC'],
+ 'BIN=%s' % dirs['bin'],
+ 'HTMLDIR=%s' % dirs['html'],
+ 'RESTDIR=%s' % dirs['rest'],
+ 'MANDIR=%s' % dirs['man'],
+ 'SCRIPTDIR=%s' % dirs['scripts'],
+ 'ETC=%s' % os.path.join(dirs['etc'], name)
+ ]
+
installCmd = ['make',
'MODULE_TOPDIR=%s' % gisbase,
'ARCH_DISTDIR=%s' % os.path.join(TMPDIR, name),
More information about the grass-commit
mailing list