From a3cfcb0acdcb21bc23a2166c442a3bd0dbd18349 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Sun, 28 Mar 2010 19:17:58 +0200
Subject: [PATCH 1/1] some minor fixes for the osxnetradiant changes

---
 Makefile                                      |  2 +-
 Makefile.conf                                 | 21 +------------------
 install-dylibs.sh                             |  6 ++++--
 osx-Makefile.conf                             | 20 ++++++++++++++++++
 .../Contents/MacOS/netradiant.sh              |  1 -
 5 files changed, 26 insertions(+), 24 deletions(-)
 create mode 100644 osx-Makefile.conf
 delete mode 100755 setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh

diff --git a/Makefile b/Makefile
index 14cfac91..17e2b663 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ ifeq ($(OS),Darwin)
 	DLL = dylib
 	MWINDOWS =
 	MACVERSION ?= 16
-	CPPFLAGS += -DMACVERSION="$(MACVERSION)"
+	CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
 	# workaround for weird prints
 	ECHO_NOLF = /bin/echo -n
 
diff --git a/Makefile.conf b/Makefile.conf
index ef1d5bfc..0f5fa924 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -1,20 +1 @@
-# Makefile.conf template
-
-## OS X:
-BUILD=debug
-RADIANT_ABOUTMSG=OSX NetRadiant Custom build
-EXE=ub
-### Snow Leopard 16, Leopard 15, Tiger 14, Panther 13
-MACVERSION=16
-#
-## MacPorts:
-CPPFLAGS=-I/opt/local/include/ -I/usr/X11R6/include/ 
-LDFLAGS=-L/opt/local/lib -L/usr/X11R6/lib
-MACLIBDIR=/opt/local/lib
-
-## Fink
-## (-arch ppc can combined with -arch 386, I read somewhere. However does work fine like this on OSX 10.6) 
-# LDFLAGS=-arch i386
-# CFLAGS=-arch i386
-# TARGET_ARCH=-arch i386
-# MACLIBDIR=/sw/lib
+# empty Makefile.conf template
diff --git a/install-dylibs.sh b/install-dylibs.sh
index fd70339a..798a7d14 100644
--- a/install-dylibs.sh
+++ b/install-dylibs.sh
@@ -47,7 +47,7 @@ cp -L "$MACLIBDIR"/../etc/fonts/fonts.dtd "$INSTALLDIR"
 cp -L "$MACLIBDIR"/../etc/gtk-2.0/gdk-pixbuf.loaders "$INSTALLDIR"
 cp -L "$MACLIBDIR"/../etc/pango/pangorc "$INSTALLDIR"
 
-$CAT > $INSTALLDIR/../netradiant.sh <<EOF
+$CAT > "$INSTALLDIR/../netradiant.sh" <<EOF
 #!/bin/sh
 
 MY_DIRECTORY="\${0%/*}" # cut off the script name
@@ -65,5 +65,7 @@ if [ -x /usr/bin/open-x11 ]; then
 else
 	env LC_ALL="en_US.UTF-8" ./radiant.$EXE "$@" &
 fi
-
 EOF
+
+chmod 755 "$INSTALLDIR/../netradiant.sh"
+
diff --git a/osx-Makefile.conf b/osx-Makefile.conf
new file mode 100644
index 00000000..ef1d5bfc
--- /dev/null
+++ b/osx-Makefile.conf
@@ -0,0 +1,20 @@
+# Makefile.conf template
+
+## OS X:
+BUILD=debug
+RADIANT_ABOUTMSG=OSX NetRadiant Custom build
+EXE=ub
+### Snow Leopard 16, Leopard 15, Tiger 14, Panther 13
+MACVERSION=16
+#
+## MacPorts:
+CPPFLAGS=-I/opt/local/include/ -I/usr/X11R6/include/ 
+LDFLAGS=-L/opt/local/lib -L/usr/X11R6/lib
+MACLIBDIR=/opt/local/lib
+
+## Fink
+## (-arch ppc can combined with -arch 386, I read somewhere. However does work fine like this on OSX 10.6) 
+# LDFLAGS=-arch i386
+# CFLAGS=-arch i386
+# TARGET_ARCH=-arch i386
+# MACLIBDIR=/sw/lib
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh b/setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh
deleted file mode 100755
index f4982522..00000000
--- a/setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh
+++ /dev/null
@@ -1 +0,0 @@
-dummy for correct execute rights
\ No newline at end of file
-- 
2.39.2