summaryrefslogtreecommitdiff
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-12-17 21:54:53 (GMT)
committer Jeremy Huddleston <jeremyhu@freedesktop.org>2008-12-17 21:56:55 (GMT)
commit102abeda37d6b62971a9952efa0453e38504ae0b (patch) (side-by-side diff)
treecf669a1cdf8ae2525fd47dd785259cfe4cb328ef
parent530dfa569dc14ddfc70326bc4dddf5becabd74ef (diff)
downloadxserver-102abeda37d6b62971a9952efa0453e38504ae0b.zip
xserver-102abeda37d6b62971a9952efa0453e38504ae0b.tar.gz
XQuartz: Name the startup shell script X11 for better compatability
(cherry picked from commit f84613d6fcbbb5f769ee34cff0900353a13693cf)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xquartz/bundle/Info.plist.cpp2
-rwxr-xr-xhw/xquartz/bundle/X11.sh2
-rwxr-xr-xhw/xquartz/bundle/mk_bundke.sh2
-rw-r--r--hw/xquartz/mach-startup/Makefile.am16
4 files changed, 11 insertions, 11 deletions
diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 9713289..16434f2 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>X11.sh</string>
+ <string>X11</string>
<key>CFBundleGetInfoString</key>
<string>APPLE_APPLICATION_NAME</string>
<key>CFBundleIconFile</key>
diff --git a/hw/xquartz/bundle/X11.sh b/hw/xquartz/bundle/X11.sh
index 2f953d1..87c52b3 100755
--- a/hw/xquartz/bundle/X11.sh
+++ b/hw/xquartz/bundle/X11.sh
@@ -1,3 +1,3 @@
#!/bin/bash --login
-"$(dirname $0)"/X11 "${@}"
+"$(dirname $0)"/X11.bin "${@}"
diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh
index 5c5733a..7c8d148 100755
--- a/hw/xquartz/bundle/mk_bundke.sh
+++ b/hw/xquartz/bundle/mk_bundke.sh
@@ -21,7 +21,7 @@ install -m 644 Info.plist ${BUNDLE_ROOT}/Contents
install -m 644 PkgInfo ${BUNDLE_ROOT}/Contents
mkdir -p ${BUNDLE_ROOT}/Contents/MacOS
-install -m 755 X11.sh ${BUNDLE_ROOT}/Contents/MacOS
+install -m 755 X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11
if [[ $(id -u) == 0 ]] ; then
chown -R root:admin ${BUNDLE_ROOT}
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index b4e7852..40060d0 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -4,16 +4,16 @@ AM_CPPFLAGS = \
-DX11BINDIR=\"$(bindir)\"
x11appdir = $(APPLE_APPLICATIONS_DIR)/X11.app/Contents/MacOS
-x11app_PROGRAMS = X11
+x11app_PROGRAMS = X11.bin
-dist_X11_SOURCES = \
+dist_X11_bin_SOURCES = \
bundle-main.c
-nodist_X11_SOURCES = \
+nodist_X11_bin_SOURCES = \
mach_startupServer.c \
mach_startupUser.c
-X11_LDADD = \
+X11_bin_LDADD = \
$(top_builddir)/hw/xquartz/libXquartz.la \
$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
$(top_builddir)/dix/dixfonts.lo \
@@ -21,7 +21,7 @@ X11_LDADD = \
$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
-X11_LDFLAGS = \
+X11_bin_LDFLAGS = \
-XCClinker -Objc \
-Wl,-u,_miDCInitialize \
-Wl,-framework,Carbon \
@@ -30,17 +30,17 @@ X11_LDFLAGS = \
-Wl,-framework,IOKit
if GLX
-X11_LDADD += \
+X11_bin_LDADD += \
$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
$(top_builddir)/glx/libglx.la
-X11_LDFLAGS += \
+X11_bin_LDFLAGS += \
-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
-Wl,-framework,OpenGL
endif
if RECORD
-X11_LDADD += \
+X11_bin_LDADD += \
$(top_builddir)/record/librecord.la
endif