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 @@ -7,3 +7,3 @@ <key>CFBundleExecutable</key> - <string>X11.sh</string> + <string>X11</string> <key>CFBundleGetInfoString</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 @@ -2,2 +2,2 @@ -"$(dirname $0)"/X11 "${@}" +"$(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 @@ -23,3 +23,3 @@ 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 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 @@ -6,8 +6,8 @@ AM_CPPFLAGS = \ 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 \ @@ -15,3 +15,3 @@ nodist_X11_SOURCES = \ -X11_LDADD = \ +X11_bin_LDADD = \ $(top_builddir)/hw/xquartz/libXquartz.la \ @@ -23,3 +23,3 @@ X11_LDADD = \ -X11_LDFLAGS = \ +X11_bin_LDFLAGS = \ -XCClinker -Objc \ @@ -32,3 +32,3 @@ X11_LDFLAGS = \ if GLX -X11_LDADD += \ +X11_bin_LDADD += \ $(top_builddir)/hw/xquartz/GL/libCGLCore.la \ @@ -36,3 +36,3 @@ X11_LDADD += \ -X11_LDFLAGS += \ +X11_bin_LDFLAGS += \ -L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \ @@ -42,3 +42,3 @@ endif if RECORD -X11_LDADD += \ +X11_bin_LDADD += \ $(top_builddir)/record/librecord.la |