diff options
author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-17 13:54:53 -0800 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-17 13:56:55 -0800 |
commit | 102abeda37d6b62971a9952efa0453e38504ae0b (patch) | |
tree | cf669a1cdf8ae2525fd47dd785259cfe4cb328ef | |
parent | 530dfa569dc14ddfc70326bc4dddf5becabd74ef (diff) |
XQuartz: Name the startup shell script X11 for better compatability
(cherry picked from commit f84613d6fcbbb5f769ee34cff0900353a13693cf)
-rw-r--r-- | hw/xquartz/bundle/Info.plist.cpp | 2 | ||||
-rwxr-xr-x | hw/xquartz/bundle/X11.sh | 2 | ||||
-rwxr-xr-x | hw/xquartz/bundle/mk_bundke.sh | 2 | ||||
-rw-r--r-- | hw/xquartz/mach-startup/Makefile.am | 16 |
4 files changed, 11 insertions, 11 deletions
diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp index 971328990..16434f268 100644 --- a/hw/xquartz/bundle/Info.plist.cpp +++ b/hw/xquartz/bundle/Info.plist.cpp | |||
@@ -5,7 +5,7 @@ | |||
5 | <key>CFBundleDevelopmentRegion</key> | 5 | <key>CFBundleDevelopmentRegion</key> |
6 | <string>English</string> | 6 | <string>English</string> |
7 | <key>CFBundleExecutable</key> | 7 | <key>CFBundleExecutable</key> |
8 | <string>X11.sh</string> | 8 | <string>X11</string> |
9 | <key>CFBundleGetInfoString</key> | 9 | <key>CFBundleGetInfoString</key> |
10 | <string>APPLE_APPLICATION_NAME</string> | 10 | <string>APPLE_APPLICATION_NAME</string> |
11 | <key>CFBundleIconFile</key> | 11 | <key>CFBundleIconFile</key> |
diff --git a/hw/xquartz/bundle/X11.sh b/hw/xquartz/bundle/X11.sh index 2f953d16c..87c52b362 100755 --- a/hw/xquartz/bundle/X11.sh +++ b/hw/xquartz/bundle/X11.sh | |||
@@ -1,3 +1,3 @@ | |||
1 | #!/bin/bash --login | 1 | #!/bin/bash --login |
2 | 2 | ||
3 | "$(dirname $0)"/X11 "${@}" | 3 | "$(dirname $0)"/X11.bin "${@}" |
diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh index 5c5733abf..7c8d14898 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 | |||
21 | install -m 644 PkgInfo ${BUNDLE_ROOT}/Contents | 21 | install -m 644 PkgInfo ${BUNDLE_ROOT}/Contents |
22 | 22 | ||
23 | mkdir -p ${BUNDLE_ROOT}/Contents/MacOS | 23 | mkdir -p ${BUNDLE_ROOT}/Contents/MacOS |
24 | install -m 755 X11.sh ${BUNDLE_ROOT}/Contents/MacOS | 24 | install -m 755 X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11 |
25 | 25 | ||
26 | if [[ $(id -u) == 0 ]] ; then | 26 | if [[ $(id -u) == 0 ]] ; then |
27 | chown -R root:admin ${BUNDLE_ROOT} | 27 | chown -R root:admin ${BUNDLE_ROOT} |
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am index b4e78522a..40060d01b 100644 --- a/hw/xquartz/mach-startup/Makefile.am +++ b/hw/xquartz/mach-startup/Makefile.am | |||
@@ -4,16 +4,16 @@ AM_CPPFLAGS = \ | |||
4 | -DX11BINDIR=\"$(bindir)\" | 4 | -DX11BINDIR=\"$(bindir)\" |
5 | 5 | ||
6 | x11appdir = $(APPLE_APPLICATIONS_DIR)/X11.app/Contents/MacOS | 6 | x11appdir = $(APPLE_APPLICATIONS_DIR)/X11.app/Contents/MacOS |
7 | x11app_PROGRAMS = X11 | 7 | x11app_PROGRAMS = X11.bin |
8 | 8 | ||
9 | dist_X11_SOURCES = \ | 9 | dist_X11_bin_SOURCES = \ |
10 | bundle-main.c | 10 | bundle-main.c |
11 | 11 | ||
12 | nodist_X11_SOURCES = \ | 12 | nodist_X11_bin_SOURCES = \ |
13 | mach_startupServer.c \ | 13 | mach_startupServer.c \ |
14 | mach_startupUser.c | 14 | mach_startupUser.c |
15 | 15 | ||
16 | X11_LDADD = \ | 16 | X11_bin_LDADD = \ |
17 | $(top_builddir)/hw/xquartz/libXquartz.la \ | 17 | $(top_builddir)/hw/xquartz/libXquartz.la \ |
18 | $(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \ | 18 | $(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \ |
19 | $(top_builddir)/dix/dixfonts.lo \ | 19 | $(top_builddir)/dix/dixfonts.lo \ |
@@ -21,7 +21,7 @@ X11_LDADD = \ | |||
21 | $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ | 21 | $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ |
22 | $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin | 22 | $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin |
23 | 23 | ||
24 | X11_LDFLAGS = \ | 24 | X11_bin_LDFLAGS = \ |
25 | -XCClinker -Objc \ | 25 | -XCClinker -Objc \ |
26 | -Wl,-u,_miDCInitialize \ | 26 | -Wl,-u,_miDCInitialize \ |
27 | -Wl,-framework,Carbon \ | 27 | -Wl,-framework,Carbon \ |
@@ -30,17 +30,17 @@ X11_LDFLAGS = \ | |||
30 | -Wl,-framework,IOKit | 30 | -Wl,-framework,IOKit |
31 | 31 | ||
32 | if GLX | 32 | if GLX |
33 | X11_LDADD += \ | 33 | X11_bin_LDADD += \ |
34 | $(top_builddir)/hw/xquartz/GL/libCGLCore.la \ | 34 | $(top_builddir)/hw/xquartz/GL/libCGLCore.la \ |
35 | $(top_builddir)/glx/libglx.la | 35 | $(top_builddir)/glx/libglx.la |
36 | 36 | ||
37 | X11_LDFLAGS += \ | 37 | X11_bin_LDFLAGS += \ |
38 | -L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \ | 38 | -L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \ |
39 | -Wl,-framework,OpenGL | 39 | -Wl,-framework,OpenGL |
40 | endif | 40 | endif |
41 | 41 | ||
42 | if RECORD | 42 | if RECORD |
43 | X11_LDADD += \ | 43 | X11_bin_LDADD += \ |
44 | $(top_builddir)/record/librecord.la | 44 | $(top_builddir)/record/librecord.la |
45 | endif | 45 | endif |
46 | 46 | ||