summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-01-15 20:57:42 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-01-15 20:57:42 -0800
commitf020900641b44a1142e5c2198e9678de2744454e (patch)
tree9cf52a46659b349ef91e2a198a7b3309d402bd45
parenta5e191578e50a249e67fa26d273db4aca26ee996 (diff)
XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
-rw-r--r--configure.ac4
-rw-r--r--hw/xquartz/bundle/Makefile.am5
-rwxr-xr-xhw/xquartz/bundle/mk_bundke.sh16
-rw-r--r--hw/xquartz/mach-startup/Makefile.am4
-rw-r--r--include/dix-config.h.in3
5 files changed, 20 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index da5f488f9..a90d40055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,9 @@ dnl drivers.
39AC_CONFIG_HEADERS(include/xorg-server.h) 39AC_CONFIG_HEADERS(include/xorg-server.h)
40dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just 40dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just
41dnl dix/). 41dnl dix/).
42AC_CONFIG_HEADERS(include/dix-config.h) 42AC_CONFIG_HEADERS(include/dix-config.h, [mv include/dix-config.h include/dix-config.h.tmp
43 sed 's|/undef|#undef|' < include/dix-config.h.tmp > include/dix-config.h
44 rm include/dix-config.h.tmp])
43dnl xorg-config.h covers the Xorg DDX. 45dnl xorg-config.h covers the Xorg DDX.
44AC_CONFIG_HEADERS(include/xorg-config.h) 46AC_CONFIG_HEADERS(include/xorg-config.h)
45dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs. 47dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 03fa1ddb1..963327bb9 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -5,7 +5,10 @@ CPP_FILES_FLAGS = \
5 -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)" 5 -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)"
6 6
7install-data-hook: 7install-data-hook:
8 ./mk_bundke.sh $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app 8 $(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install
9
10uninstall-hook:
11 $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app
9 12
10noinst_PRE = Info.plist.cpp 13noinst_PRE = Info.plist.cpp
11noinst_DATA = $(noinst_PRE:plist.cpp=plist) 14noinst_DATA = $(noinst_PRE:plist.cpp=plist)
diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh
index 7c8d14898..c85b21765 100755
--- a/hw/xquartz/bundle/mk_bundke.sh
+++ b/hw/xquartz/bundle/mk_bundke.sh
@@ -2,7 +2,9 @@
2# 2#
3# 'Cause xcodebuild is hard to deal with 3# 'Cause xcodebuild is hard to deal with
4 4
5BUNDLE_ROOT=$1 5SRCDIR=$1
6BUILDDIR=$2
7BUNDLE_ROOT=$3
6 8
7localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW" 9localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW"
8for lang in ${localities} ; do 10for lang in ${localities} ; do
@@ -10,18 +12,18 @@ for lang in ${localities} ; do
10 [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1 12 [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1
11 13
12 for f in InfoPlist.strings Localizable.strings main.nib/keyedobjects.nib ; do 14 for f in InfoPlist.strings Localizable.strings main.nib/keyedobjects.nib ; do
13 install -m 644 Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f} 15 install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}
14 done 16 done
15done 17done
16 18
17install -m 644 Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib 19install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib
18install -m 644 Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources 20install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources
19 21
20install -m 644 Info.plist ${BUNDLE_ROOT}/Contents 22install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents
21install -m 644 PkgInfo ${BUNDLE_ROOT}/Contents 23install -m 644 ${SRCDIR}/PkgInfo ${BUNDLE_ROOT}/Contents
22 24
23mkdir -p ${BUNDLE_ROOT}/Contents/MacOS 25mkdir -p ${BUNDLE_ROOT}/Contents/MacOS
24install -m 755 X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11 26install -m 755 ${SRCDIR}/X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11
25 27
26if [[ $(id -u) == 0 ]] ; then 28if [[ $(id -u) == 0 ]] ; then
27 chown -R root:admin ${BUNDLE_ROOT} 29 chown -R root:admin ${BUNDLE_ROOT}
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 40060d01b..b0112949d 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -65,8 +65,8 @@ BUILT_SOURCES = \
65CLEANFILES = \ 65CLEANFILES = \
66 $(BUILT_SOURCES) 66 $(BUILT_SOURCES)
67 67
68$(BUILT_SOURCES): mach_startup.defs 68$(BUILT_SOURCES): $(srcdir)/mach_startup.defs
69 mig -sheader mach_startupServer.h mach_startup.defs 69 mig -sheader mach_startupServer.h $(srcdir)/mach_startup.defs
70 70
71EXTRA_DIST = \ 71EXTRA_DIST = \
72 launchd_fd.h \ 72 launchd_fd.h \
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 8e047c491..e1d226c84 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -434,7 +434,8 @@
434#if defined(__LP64__) && !defined(_XSERVER64) 434#if defined(__LP64__) && !defined(_XSERVER64)
435#define _XSERVER64 1 435#define _XSERVER64 1
436#elif !defined(__LP64__) && defined(_XSERVER64) 436#elif !defined(__LP64__) && defined(_XSERVER64)
437#undef _XSERVER64 437/* configure mangles #undef, so we fix this in AC_CONFIG_HEADERS post process */
438/undef _XSERVER64
438#endif 439#endif
439#endif 440#endif
440 441