diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-15 21:03:27 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-15 21:03:27 -0800 |
| commit | 1c504dff8a84804888f18ee9b184f0c4584185d7 (patch) | |
| tree | 01e8c611946f47d1ec5440b68d206be83847e21c /hw/xquartz/bundle | |
| parent | 717a961528ec69a6e630d536e15568670e0b398a (diff) | |
XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
Diffstat (limited to 'hw/xquartz/bundle')
| -rw-r--r-- | hw/xquartz/bundle/Makefile.am | 5 | ||||
| -rwxr-xr-x | hw/xquartz/bundle/mk_bundke.sh | 16 |
2 files changed, 13 insertions, 8 deletions
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 = \ -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) 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 @@ # # '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} |