summaryrefslogtreecommitdiff
authorBen Byer <bbyer@bbyer.apple.com>2007-11-09 23:44:30 (GMT)
committer Ben Byer <bbyer@bbyer.apple.com>2007-11-09 23:44:30 (GMT)
commit365eeda0bf20c76119f358fba6fe9e7b6cbb872d (patch)
tree59389016a040a284bc09b8b36b97d7a73891c23a
parent9be5f6c850f1e6684a3c00ee886cbae7da728b77 (diff)
downloadxserver-365eeda0bf20c76119f358fba6fe9e7b6cbb872d.zip
xserver-365eeda0bf20c76119f358fba6fe9e7b6cbb872d.tar.gz
xserver-365eeda0bf20c76119f358fba6fe9e7b6cbb872d.tar.bz2
Fix {/usr/X11,/Applications/Utilities}/X11.app install targets to properly respect
$DESTDIR. Credit to Jeremy Huddleston
-rw-r--r--hw/darwin/Makefile.am6
1 files changed, 3 insertions, 3 deletions
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 \