[GRASS-SVN] r35001 - in grass/branches/releasebranch_6_4/visualization/nviz: . html

[svn_grass at osgeo.org]

Author: pkelly
Date: 2008-12-23 06:17:00 -0500 (Tue, 23 Dec 2008)
New Revision: 35001

Modified:
   grass/branches/releasebranch_6_4/visualization/nviz/Makefile
   grass/branches/releasebranch_6_4/visualization/nviz/html/Makefile
Log:
Don't use find -L in an Msys build as the -L option isn't recognised


Modified: grass/branches/releasebranch_6_4/visualization/nviz/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/Makefile	2008-12-23 02:42:38 UTC (rev 35000)
+++ grass/branches/releasebranch_6_4/visualization/nviz/Makefile	2008-12-23 11:17:00 UTC (rev 35001)
@@ -9,6 +9,12 @@
 PROG=nviz
 INSTALL_DIR=$(GISBASE)/etc/$(NV_VER)
 
+ifneq ($(strip $(MINGW)),)
+	FIND = find
+else
+	FIND = find -L
+endif
+
 SCRIPTS := \
 	scripts/script_get_line \
 	scripts/script_play \
@@ -37,7 +43,7 @@
 	for file in $(SCRIPTS) ; do $(INSTALL) $$file $(INSTALL_DIR)/scripts ; done
 	-$(MKDIR) $(INSTALL_DIR)/bitmaps
 	-$(MKDIR) $(INSTALL_DIR)/bitmaps/flythrough
-	find -L bitmaps -path '*/.svn' -prune -o -type f -print | \
+	$(FIND) bitmaps -path '*/.svn' -prune -o -type f -print | \
 		while read file ; do $(INSTALL_DATA) $$file $(INSTALL_DIR)/$$file ; done
 
 docs:

Modified: grass/branches/releasebranch_6_4/visualization/nviz/html/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/html/Makefile	2008-12-23 02:42:38 UTC (rev 35000)
+++ grass/branches/releasebranch_6_4/visualization/nviz/html/Makefile	2008-12-23 11:17:00 UTC (rev 35001)
@@ -5,6 +5,12 @@
 
 GRASS_NVIZ_DOCS=$(GISBASE)/docs/html/nviz
 
+ifneq ($(strip $(MINGW)),)
+	FIND = find
+else
+	FIND = find -L
+endif
+
 default:
 	-$(MKDIR) $(GISBASE)/docs
 	-$(MKDIR) $(GISBASE)/docs/html
@@ -14,5 +20,5 @@
 	-$(MKDIR) $(GRASS_NVIZ_DOCS)/nvimg
 	-$(MKDIR) $(GRASS_NVIZ_DOCS)/nvimg/panel
 	-$(MKDIR) $(GRASS_NVIZ_DOCS)/nvimg/work
-	find -L . -type f \( -name '*.html' -o -name '*.png' -o -name '*.gif' \) -print | \
+	$(FIND) . -type f \( -name '*.html' -o -name '*.png' -o -name '*.gif' \) -print | \
 		while read file ; do $(INSTALL_DATA) $$file $(GRASS_NVIZ_DOCS)/$$file ; done