more updates for new directory structure

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/distrib/build.py

@@ -592,7 +592,7 @@ clean:
 	-erase $(MODULE).lib
 	-erase $(MODULE).ilk
 	-erase $(TARGET)
-        -erase $(BUILDDIR)\$(TARGET)
+	-erase $(BUILDDIR)\$(TARGET)
 %(PYCLEANUP)s
 
 
@@ -762,7 +762,7 @@ install: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles %(OTHERINSTALLTARG
 clean:
 	-rm -f *.o *$(SO) *~
 	-rm -f $(TARGET)
-        -rm -f $(BUILDDIR)/$(TARGET)
+	-rm -f $(BUILDDIR)/$(TARGET)
 %(PYCLEANUP)s
 
 uninstall: %(OTHERUNINSTALLTARGETS)s

wxPython/distrib/maketgz

@@ -34,15 +34,12 @@ tar xf dist-temp.tar
 rm dist-temp.tar
 mv wxPython wxPython-$1
 rm wxPython-$1/src/gtk/helpers.cpp
+touch `find wxPython-$1 -name "*.cpp"`
+touch `find wxPython-$1 -name "*.py"`
+
 
 tar cvf wxPython-$1.tar wxPython-$1
 gzip wxPython-$1.tar
 
 rm -rf wxPython-$1
 
-
-
-
-
-
-

wxPython/distrib/wxPython.spec

@@ -35,13 +35,14 @@ cd ../modules/html
 python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../utils
 python ../../distrib/build.py -b WXPSRCDIR=../../src
-cd ../glcanvas
-python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../ogl
 python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../stc
 python ../../distrib/build.py -b WXPSRCDIR=../../src
-
+if [ ! -z $NOGLCANVAS ]; then
+    cd ../glcanvas
+    python ../../distrib/build.py -b WXPSRCDIR=../../src
+fi
 
 %install
 cd src
@@ -50,12 +51,14 @@ cd ../modules/html
 python ../../distrib/build.py -i
 cd ../utils
 python ../../distrib/build.py -i
-cd ../glcanvas
-python ../../distrib/build.py -i
 cd ../ogl
 python ../../distrib/build.py -i
 cd ../stc
 python ../../distrib/build.py -i
+if [ ! -z $NOGLCANVAS ]; then
+    cd ../glcanvas
+    python ../../distrib/build.py -i
+fi
 
 
 %post
@@ -71,6 +74,3 @@ python ../../distrib/build.py -i
 
 
 
-
-
-