fix grass/__init__.py

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37993 15284696-431f-4ddb-bdfa-cd5b030d7da7
smitikothari · Jun 20, 2009 · 3e3983e · 3e3983e
1 parent 5371500
commit 3e3983e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/python/Makefile b/lib/python/Makefile
@@ -22,8 +22,7 @@ $(GDIR): $(PYDIR)
 
 $(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) $< $@

diff --git a/lib/python/__init__.py b/lib/python/__init__.py
@@ -2,4 +2,3 @@
 from db     import *
 from raster import *
 from vector import *
-
diff --git a/lib/python/grass__init__.py b/lib/python/grass__init__.py
@@ -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")
diff --git a/swig/python/Makefile b/swig/python/Makefile
@@ -65,8 +65,6 @@ $(GDIR): $(PYDIR)
 
 $(DSTDIR): $(GDIR)
 	test -d $@ || $(MKDIR) -p $@
-	test -f __init__.py || touch $(GDIR)/__init__.py
-	@echo "import lib" >> $(GDIR)/__init__.py
 
 $(DSTDIR)/_%.so: _%.so
 	$(INSTALL) $< $@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@
		from db import *
		from raster import *
		from vector import *