diff options
author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-15 20:57:42 -0800 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-15 20:57:42 -0800 |
commit | f020900641b44a1142e5c2198e9678de2744454e (patch) | |
tree | 9cf52a46659b349ef91e2a198a7b3309d402bd45 | |
parent | a5e191578e50a249e67fa26d273db4aca26ee996 (diff) |
XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | hw/xquartz/bundle/Makefile.am | 5 | ||||
-rwxr-xr-x | hw/xquartz/bundle/mk_bundke.sh | 16 | ||||
-rw-r--r-- | hw/xquartz/mach-startup/Makefile.am | 4 | ||||
-rw-r--r-- | include/dix-config.h.in | 3 |
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. | |||
39 | AC_CONFIG_HEADERS(include/xorg-server.h) | 39 | AC_CONFIG_HEADERS(include/xorg-server.h) |
40 | dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just | 40 | dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just |
41 | dnl dix/). | 41 | dnl dix/). |
42 | AC_CONFIG_HEADERS(include/dix-config.h) | 42 | AC_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]) | ||
43 | dnl xorg-config.h covers the Xorg DDX. | 45 | dnl xorg-config.h covers the Xorg DDX. |
44 | AC_CONFIG_HEADERS(include/xorg-config.h) | 46 | AC_CONFIG_HEADERS(include/xorg-config.h) |
45 | dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs. | 47 | dnl 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 | ||
7 | install-data-hook: | 7 | install-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 | |||
10 | uninstall-hook: | ||
11 | $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app | ||
9 | 12 | ||
10 | noinst_PRE = Info.plist.cpp | 13 | noinst_PRE = Info.plist.cpp |
11 | noinst_DATA = $(noinst_PRE:plist.cpp=plist) | 14 | noinst_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 | ||
5 | BUNDLE_ROOT=$1 | 5 | SRCDIR=$1 |
6 | BUILDDIR=$2 | ||
7 | BUNDLE_ROOT=$3 | ||
6 | 8 | ||
7 | localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW" | 9 | localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW" |
8 | for lang in ${localities} ; do | 10 | for 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 |
15 | done | 17 | done |
16 | 18 | ||
17 | install -m 644 Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib | 19 | install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib |
18 | install -m 644 Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources | 20 | install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources |
19 | 21 | ||
20 | install -m 644 Info.plist ${BUNDLE_ROOT}/Contents | 22 | install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents |
21 | install -m 644 PkgInfo ${BUNDLE_ROOT}/Contents | 23 | install -m 644 ${SRCDIR}/PkgInfo ${BUNDLE_ROOT}/Contents |
22 | 24 | ||
23 | mkdir -p ${BUNDLE_ROOT}/Contents/MacOS | 25 | mkdir -p ${BUNDLE_ROOT}/Contents/MacOS |
24 | install -m 755 X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11 | 26 | install -m 755 ${SRCDIR}/X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11 |
25 | 27 | ||
26 | if [[ $(id -u) == 0 ]] ; then | 28 | if [[ $(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 = \ | |||
65 | CLEANFILES = \ | 65 | CLEANFILES = \ |
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 | ||
71 | EXTRA_DIST = \ | 71 | EXTRA_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 | ||