[GRASS-SVN] r37668 - grass/trunk/vector/v.in.dwg

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-06-01 01:24:12 -0400 (Mon, 01 Jun 2009)
New Revision: 37668

Added:
   grass/trunk/vector/v.in.dwg/WARNING
Modified:
   grass/trunk/vector/v.in.dwg/Makefile
Log:
Makefile clean-up
Fix interactive check


Modified: grass/trunk/vector/v.in.dwg/Makefile
===================================================================
--- grass/trunk/vector/v.in.dwg/Makefile	2009-06-01 05:21:12 UTC (rev 37667)
+++ grass/trunk/vector/v.in.dwg/Makefile	2009-06-01 05:24:12 UTC (rev 37668)
@@ -1,7 +1,8 @@
 MODULE_TOPDIR = ../..
 
 PGM=v.in.dwg
-ADINIT = $(ARCH_DISTDIR)/etc/adinit.dat
+ADINIT = $(ETC)/adinit.dat
+ADINITSRC := $(shell echo $(OPENDWGINCPATH) | cut -b3- )/adinit/adinit.dat
 
 DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
 LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB) $(OPENDWGLIBPATH) $(OPENDWGLIB)
@@ -11,12 +12,20 @@
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 ifneq ($(USE_OPENDWG),)
-default: chck cmd $(ADINIT)
+default: check
+	$(MAKE) cmd $(ADINIT)
 endif
 
-chck:
-	./check
+check:
+ifneq ($(strip $(MINGW)),)
+	cat WARNING
+else
+	cat WARNING >/dev/tty
+endif
+	@read IN </dev/tty ; if [ "$$IN" != "yes" ]; then exit 1; fi
 
+.PHONY: check
+
 #a bit ugly:
-$(ADINIT):
-	$(INSTALL_DATA) `echo $(OPENDWGINCPATH) | cut -b3-`/adinit/adinit.dat $(ADINIT)
+$(ADINIT): $(ADINITSRC)
+	$(INSTALL_DATA) $< $@

Added: grass/trunk/vector/v.in.dwg/WARNING
===================================================================
--- grass/trunk/vector/v.in.dwg/WARNING	                        (rev 0)
+++ grass/trunk/vector/v.in.dwg/WARNING	2009-06-01 05:24:12 UTC (rev 37668)
@@ -0,0 +1,7 @@
+-----------------------------------------------------------------------------
+------------------------------   WARNING  -----------------------------------  
+v.in.dwg is linked to proprietary library 'OpenDWG toolkit' (www.opendwg.org)
+and to GRASS libraries released under GPL. As a consequence, it is not allowed
+to distribute binary version of v.in.dwg.
+If you really want to build the binaries for v.in.dwg and lose the possibility
+of distributing GRASS binary package, type 'yes'<Enter>."