[GRASS-SVN] r37995 - in grass/branches/releasebranch_6_4: lib/python swig/python

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-06-20 05:17:43 -0400 (Sat, 20 Jun 2009)
New Revision: 37995

Added:
   grass/branches/releasebranch_6_4/lib/python/grass__init__.py
Modified:
   grass/branches/releasebranch_6_4/lib/python/Makefile
   grass/branches/releasebranch_6_4/lib/python/__init__.py
   grass/branches/releasebranch_6_4/swig/python/Makefile
Log:
fix grass/__init__.py
   (merge from trunk, r37993)


Modified: grass/branches/releasebranch_6_4/lib/python/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/Makefile	2009-06-20 09:17:04 UTC (rev 37994)
+++ grass/branches/releasebranch_6_4/lib/python/Makefile	2009-06-20 09:17:43 UTC (rev 37995)
@@ -24,8 +24,7 @@
 
 $(DSTDIR): $(GDIR)
 	test -d $@ || $(MKDIR) -p $@
-	test -f __init__.py || touch $(GDIR)/__init__.py
-	@echo "import script" >> $(GDIR)/__init__.py
+	@cat grass__init__.py > $(GDIR)/__init__.py
 
 $(DSTDIR)/%: %
 	$(INSTALL_DATA) $< $@

Modified: grass/branches/releasebranch_6_4/lib/python/__init__.py
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/__init__.py	2009-06-20 09:17:04 UTC (rev 37994)
+++ grass/branches/releasebranch_6_4/lib/python/__init__.py	2009-06-20 09:17:43 UTC (rev 37995)
@@ -2,4 +2,3 @@
 from db     import *
 from raster import *
 from vector import *
-

Copied: grass/branches/releasebranch_6_4/lib/python/grass__init__.py (from rev 37993, grass/trunk/lib/python/grass__init__.py)
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/grass__init__.py	                        (rev 0)
+++ grass/branches/releasebranch_6_4/lib/python/grass__init__.py	2009-06-20 09:17:43 UTC (rev 37995)
@@ -0,0 +1,4 @@
+import os
+__all__ = ["script"]
+if os.path.exists(os.path.join(os.path.dirname(__file__), "lib", "__init__.py")):
+    __all__.append("lib")

Modified: grass/branches/releasebranch_6_4/swig/python/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/swig/python/Makefile	2009-06-20 09:17:04 UTC (rev 37994)
+++ grass/branches/releasebranch_6_4/swig/python/Makefile	2009-06-20 09:17:43 UTC (rev 37995)
@@ -64,8 +64,6 @@
 
 $(DSTDIR): $(GDIR)
 	test -d $@ || $(MKDIR) -p $@
-	test -f __init__.py || touch $(GDIR)/__init__.py
-	@echo "import lib" >> $(GDIR)/__init__.py
 
 $(DSTDIR)/_%.so: _%.so
 	$(INSTALL) $< $@