From 305b8c10f1edef28c6e6073886b26885ed4e195d Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 19 Oct 1999 05:01:36 +0000
Subject: [PATCH] Added a simple makefile for those whose fingers can't type
 anything but "make install"

Ensure that the full TARGETDIR exists

changed the build scripts to play nicer with make.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 utils/wxPython/Makefile            | 18 ++++++++++++++++++
 utils/wxPython/buildall            |  4 ++--
 utils/wxPython/buildall.bat        |  4 ++--
 utils/wxPython/distrib/build.py    |  5 +++--
 utils/wxPython/modules/buildall.py |  1 +
 5 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 utils/wxPython/Makefile

diff --git a/utils/wxPython/Makefile b/utils/wxPython/Makefile
new file mode 100644
index 0000000000..f0c1f754dd
--- /dev/null
+++ b/utils/wxPython/Makefile
@@ -0,0 +1,18 @@
+#----------------------------------------------------------------------
+# Convenience makefile to drive the build script in a more user
+# friendly manner.
+#----------------------------------------------------------------------
+
+
+all:
+	./buildall -b
+
+
+install: all
+	./buildall -i
+
+clean:
+	./buildall -c
+
+uninstall:
+	./buildall -u
diff --git a/utils/wxPython/buildall b/utils/wxPython/buildall
index 56830c495c..26870e3f48 100755
--- a/utils/wxPython/buildall
+++ b/utils/wxPython/buildall
@@ -1,11 +1,11 @@
 #!/bin/bash
 cd src
-build $*
+python ../distrib/build.py $*
 if [ "$?" != "0" ]; then
     exit 1
 fi
 
 cd ../modules
-buildall.py $*
+python buildall.py $*
 cd ..
 
diff --git a/utils/wxPython/buildall.bat b/utils/wxPython/buildall.bat
index e6ebf75a76..87de38f028 100755
--- a/utils/wxPython/buildall.bat
+++ b/utils/wxPython/buildall.bat
@@ -1,9 +1,9 @@
 
 cd %WXWIN%\utils\wxPython\src
-build %1 %2 %3 %4 %5 %6 %7 %8 %9
+python ..\distrib\build.py %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 cd %WXWIN%\utils\wxPython\modules
-buildall %1 %2 %3 %4 %5 %6 %7 %8 %9
+python .\buildall.py %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 
 cd %WXWIN%\utils\wxPython
diff --git a/utils/wxPython/distrib/build.py b/utils/wxPython/distrib/build.py
index c783a6bf6c..3ff35d745d 100755
--- a/utils/wxPython/distrib/build.py
+++ b/utils/wxPython/distrib/build.py
@@ -757,7 +757,7 @@ pycfiles : $(PYMODULES)
 
 
 $(TARGETDIR) :
-	mkdir $(TARGETDIR)
+	mkdir -p $(TARGETDIR)
 
 $(GENCODEDIR):
 	mkdir $(GENCODEDIR)
@@ -775,7 +775,8 @@ $(GENCODEDIR):
 #----------------------------------------------------------------------------
 
 if __name__ == '__main__':
-    main(sys.argv)
+    err = main(sys.argv)
+    sys.exit(err)
 
 #----------------------------------------------------------------------------
 
diff --git a/utils/wxPython/modules/buildall.py b/utils/wxPython/modules/buildall.py
index 97ed35d1ff..79ef843b1f 100755
--- a/utils/wxPython/modules/buildall.py
+++ b/utils/wxPython/modules/buildall.py
@@ -28,3 +28,4 @@ for module in MODULELIST:
     if err:
         break
 
+sys.exit(err)
-- 
2.45.2