[GRASS-SVN] r37094 - in grass/branches/releasebranch_6_4: general/g.gui gui/tcltk

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-10 06:14:23 -0400 (Sun, 10 May 2009)
New Revision: 37094

Modified:
   grass/branches/releasebranch_6_4/general/g.gui/main.c
   grass/branches/releasebranch_6_4/gui/tcltk/Makefile
Log:
don't install d.m on WinGRASS (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/general/g.gui/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.gui/main.c	2009-05-10 10:02:13 UTC (rev 37093)
+++ grass/branches/releasebranch_6_4/general/g.gui/main.c	2009-05-10 10:14:23 UTC (rev 37094)
@@ -102,6 +102,9 @@
 
 
     if (strcmp(type->answer, "oldtcltk") == 0) {
+#ifdef __MINGW32__
+	G_fatal_error(_("The old d.m GUI is not available for WinGRASS"));
+#endif
 	sprintf(progname, "%s/etc/dm/d.m.tcl", G_gisbase());
 	if (rc_file->answer) {
 	    G_spawn(getenv("GRASS_WISH"), "d.m", progname, "-name", "d_m_tcl",

Modified: grass/branches/releasebranch_6_4/gui/tcltk/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/Makefile	2009-05-10 10:02:13 UTC (rev 37093)
+++ grass/branches/releasebranch_6_4/gui/tcltk/Makefile	2009-05-10 10:14:23 UTC (rev 37094)
@@ -1,7 +1,11 @@
 MODULE_TOPDIR = ../..
 
-SUBDIRS = d.m gis.m
+SUBDIRS = gis.m
 
+ifndef MINGW
+SUBDIRS += d.m
+endif
+
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: parsubdirs