XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
This commit is contained in:
parent
717a961528
commit
1c504dff8a
@ -45,7 +45,9 @@ dnl drivers.
|
||||
AC_CONFIG_HEADERS(include/xorg-server.h)
|
||||
dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just
|
||||
dnl dix/).
|
||||
AC_CONFIG_HEADERS(include/dix-config.h)
|
||||
AC_CONFIG_HEADERS(include/dix-config.h, [mv include/dix-config.h include/dix-config.h.tmp
|
||||
sed 's|/undef|#undef|' < include/dix-config.h.tmp > include/dix-config.h
|
||||
rm include/dix-config.h.tmp])
|
||||
dnl xorg-config.h covers the Xorg DDX.
|
||||
AC_CONFIG_HEADERS(include/xorg-config.h)
|
||||
dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.
|
||||
|
@ -5,7 +5,10 @@ CPP_FILES_FLAGS = \
|
||||
-DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)"
|
||||
|
||||
install-data-hook:
|
||||
./mk_bundke.sh $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app
|
||||
$(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install
|
||||
|
||||
uninstall-hook:
|
||||
$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app
|
||||
|
||||
noinst_PRE = Info.plist.cpp
|
||||
noinst_DATA = $(noinst_PRE:plist.cpp=plist)
|
||||
|
@ -2,7 +2,9 @@
|
||||
#
|
||||
# 'Cause xcodebuild is hard to deal with
|
||||
|
||||
BUNDLE_ROOT=$1
|
||||
SRCDIR=$1
|
||||
BUILDDIR=$2
|
||||
BUNDLE_ROOT=$3
|
||||
|
||||
localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW"
|
||||
for lang in ${localities} ; do
|
||||
@ -10,18 +12,18 @@ for lang in ${localities} ; do
|
||||
[ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1
|
||||
|
||||
for f in InfoPlist.strings Localizable.strings main.nib/keyedobjects.nib ; do
|
||||
install -m 644 Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}
|
||||
install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}
|
||||
done
|
||||
done
|
||||
|
||||
install -m 644 Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib
|
||||
install -m 644 Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources
|
||||
install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib
|
||||
install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources
|
||||
|
||||
install -m 644 Info.plist ${BUNDLE_ROOT}/Contents
|
||||
install -m 644 PkgInfo ${BUNDLE_ROOT}/Contents
|
||||
install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents
|
||||
install -m 644 ${SRCDIR}/PkgInfo ${BUNDLE_ROOT}/Contents
|
||||
|
||||
mkdir -p ${BUNDLE_ROOT}/Contents/MacOS
|
||||
install -m 755 X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11
|
||||
install -m 755 ${SRCDIR}/X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11
|
||||
|
||||
if [[ $(id -u) == 0 ]] ; then
|
||||
chown -R root:admin ${BUNDLE_ROOT}
|
||||
|
@ -65,8 +65,8 @@ BUILT_SOURCES = \
|
||||
CLEANFILES = \
|
||||
$(BUILT_SOURCES)
|
||||
|
||||
$(BUILT_SOURCES): mach_startup.defs
|
||||
mig -sheader mach_startupServer.h mach_startup.defs
|
||||
$(BUILT_SOURCES): $(srcdir)/mach_startup.defs
|
||||
mig -sheader mach_startupServer.h $(srcdir)/mach_startup.defs
|
||||
|
||||
EXTRA_DIST = \
|
||||
launchd_fd.h \
|
||||
|
@ -1,10 +0,0 @@
|
||||
/* Do not include this file directly. It is included at the end of <dix-config.h> */
|
||||
|
||||
/* Correctly set _XSERVER64 for OSX fat binaries */
|
||||
#ifdef __APPLE__
|
||||
#if defined(__LP64__) && !defined(_XSERVER64)
|
||||
#define _XSERVER64 1
|
||||
#elif !defined(__LP64__) && defined(_XSERVER64)
|
||||
#undef _XSERVER64
|
||||
#endif
|
||||
#endif
|
@ -429,6 +429,14 @@
|
||||
/* Define to 1 if you have the `ffs' function. */
|
||||
#undef HAVE_FFS
|
||||
|
||||
#include <dix-config-post-verbatim.h>
|
||||
/* Correctly set _XSERVER64 for OSX fat binaries */
|
||||
#ifdef __APPLE__
|
||||
#if defined(__LP64__) && !defined(_XSERVER64)
|
||||
#define _XSERVER64 1
|
||||
#elif !defined(__LP64__) && defined(_XSERVER64)
|
||||
/* configure mangles #undef, so we fix this in AC_CONFIG_HEADERS post process */
|
||||
/undef _XSERVER64
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _DIX_CONFIG_H_ */
|
||||
|
Loading…
Reference in New Issue
Block a user