xserver: Branch 'xorg-server-1.2-apple'
Ben Byer
bbyer at kemper.freedesktop.org
Fri Nov 9 15:44:41 PST 2007
hw/darwin/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 365eeda0bf20c76119f358fba6fe9e7b6cbb872d
Author: Ben Byer <bbyer at bbyer.apple.com>
Date: Fri Nov 9 15:44:30 2007 -0800
Fix {/usr/X11,/Applications/Utilities}/X11.app install targets to properly respect
$DESTDIR. Credit to Jeremy Huddleston
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 45eb08b..545ff2f 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -302,9 +302,9 @@ uninstall-hook:
install-data-hook: $(HOOK_TARGETS)
xquartz-install-hook:
- cd apple && xcodebuild install
- cd launcher && xcodebuild install
-
+ cd apple && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=/usr/X11 DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO
+ cd launcher && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=/Applications/Utilities DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO
+
EXTRA_DIST = \
darwin.c \
darwinClut8.h \
More information about the xorg-commit
mailing list