From 2b4ccddd7e0bc83666860541c28a10190905041f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
Date: Wed, 28 Jan 2015 14:58:26 -0500
Subject: [PATCH 07/16] (MP) BuildSystem: Destroot and install to right
 locations

`APPLICATIONS_DIR` and `DESTDIR` should be passed to `make install` as
command-line arguments. `PREFIX` is subsituted into the makefile by the
configure script.
---
 macosx/HandBrake.xcodeproj/project.pbxproj | 2 ++
 macosx/module.defs                         | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 15c4c5b..e9b2a8e 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -1375,6 +1375,7 @@
 					"\"$(EXTERNAL_BUILD)/libhb\"",
 					"\"$(EXTERNAL_BUILD)/contrib/include\"",
 				);
+				INSTALL_PATH = "$(PREFIX)/bin";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(EXTERNAL_BUILD)/libhb\"",
@@ -1420,6 +1421,7 @@
 					"\"$(EXTERNAL_BUILD)/contrib/include\"",
 				);
 				INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist";
+				INSTALL_PATH = "$(APPLICATIONS_DIR)";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(EXTERNAL_BUILD)/libhb\"",
diff --git a/macosx/module.defs b/macosx/module.defs
index 773a8a1..e856b68 100644
--- a/macosx/module.defs
+++ b/macosx/module.defs
@@ -55,6 +55,10 @@ MACOSX.XCODE = $(strip \
         \
         $(if $(GCC_VERSION),GCC_VERSION='$(GCC_VERSION)') \
         \
+        APPLICATIONS_DIR='$(APPLICATIONS_DIR)' \
+        DSTROOT='$(DESTDIR)' \
+        PREFIX='$(PREFIX)' \
+        \
         SYMROOT='$(XCODE.symroot)' \
         CONFIGURATION_BUILD_DIR='$(XCODE.symroot)' \
         CONFIGURATION_TEMP_DIR='$(XCODE.symroot)' \
-- 
2.3.0

