diff --git a/Makefile b/Makefile
index 61c195b..0709f67 100644
--- a/Makefile
+++ b/Makefile
@@ -38,18 +38,16 @@ mac: app
tar -zcvvf relational_`./relational_gui.py -v`.tar.gz relational_mac/
rm -rf relational_mac
app:
- mkdir Relational.app/ || echo Exists
- mkdir Relational.app/Contents || echo Exists
- mkdir Relational.app/Contents/Resources || echo Exists
+ mkdir -p Relational.app/Contents/Resources || echo Exists
cp *py Relational.app/Contents/Resources
- mkdir Relational.app/Contents/Resources/relational
+ mkdir -p Relational.app/Contents/Resources/relational || echo Exists
cp relational/*py Relational.app/Contents/Resources/relational
- mkdir Relational.app/Contents/Resources/relational_gui
+ mkdir -p Relational.app/Contents/Resources/relational_gui || echo Exists
cp relational_gui/*py Relational.app/Contents/Resources/relational_gui
cp mac/Info.plist mac/PkgInfo Relational.app/Contents
- mkdir Relational.app/Contents/MacOS || echo Exists
- cp mac/relational mac/Python Relational.app/Contents/MacOS
- cp mac/PythonApplet.icns mac/__argvemulator_relational.py Relational.app/Contents/Resources/
+ mkdir -p Relational.app/Contents/MacOS || echo Exists
+ cp mac/relational_gui mac/Python Relational.app/Contents/MacOS
+ cp mac/PythonApplet.icns mac/__argvemulator_relational_gui.py Relational.app/Contents/Resources/
debian:
#Python files
diff --git a/mac/Info.plist b/mac/Info.plist
index 48dee6f..31a013a 100644
--- a/mac/Info.plist
+++ b/mac/Info.plist
@@ -18,15 +18,15 @@
CFBundleExecutable
- relational
+ relational_gui
CFBundleIconFile
PythonApplet.icns
CFBundleIdentifier
- relational
+ relational_gui
CFBundleInfoDictionaryVersion
6.0
CFBundleName
- relational
+ relational_gui
CFBundlePackageType
APPL
CFBundleSignature
diff --git a/mac/__argvemulator_relational.py b/mac/__argvemulator_relational.py
deleted file mode 100644
index aa8d43d..0000000
--- a/mac/__argvemulator_relational.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import argvemulator, os
-
-argvemulator.ArgvCollector().mainloop()
-execfile(os.path.join(os.path.split(__file__)[0], "relational.py"))
diff --git a/mac/__argvemulator_relational_gui.py b/mac/__argvemulator_relational_gui.py
new file mode 100644
index 0000000..c422386
--- /dev/null
+++ b/mac/__argvemulator_relational_gui.py
@@ -0,0 +1,4 @@
+import argvemulator, os
+
+argvemulator.ArgvCollector().mainloop()
+execfile(os.path.join(os.path.split(__file__)[0], "relational_gui.py"))
diff --git a/mac/relational b/mac/relational_gui
similarity index 91%
rename from mac/relational
rename to mac/relational_gui
index 79f3c05..f625490 100755
--- a/mac/relational
+++ b/mac/relational_gui
@@ -5,7 +5,7 @@ execdir = os.path.dirname(sys.argv[0])
executable = os.path.join(execdir, "Python")
resdir = os.path.join(os.path.dirname(execdir), "Resources")
libdir = os.path.join(os.path.dirname(execdir), "Frameworks")
-mainprogram = os.path.join(resdir, "__argvemulator_relational.py")
+mainprogram = os.path.join(resdir, "__argvemulator_relational_gui.py")
sys.argv.insert(1, mainprogram)
if 0 or 0: