From 5b4da3c5e14db580cd23f4f5a90cf1f4736333b7 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 24 Feb 2012 18:29:44 -0800
Subject: [PATCH] Correct install.mk to use CFG_LIBDIR for correct install
 paths on windows.

---
 mk/install.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/install.mk b/mk/install.mk
index 47e75d439d7..acd454d1ff4 100644
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -18,7 +18,7 @@ ISTAGE = 2
 
 PREFIX_ROOT = $(CFG_PREFIX)
 PREFIX_BIN = $(PREFIX_ROOT)/bin
-PREFIX_LIB = $(PREFIX_ROOT)/lib
+PREFIX_LIB = $(PREFIX_ROOT)/$(CFG_LIBDIR)
 
 define INSTALL_TARGET_N
   # $(1) is the target triple
@@ -31,7 +31,7 @@ TL$(1)$(2) = $$(TLIB$$(ISTAGE)_T_$(1)_H_$(2))
 # PT{R,B,L} == Prefix Target {Root, Bin, Lib}
 PTR$(1)$(2) = $$(PREFIX_LIB)/rustc/$(1)
 PTB$(1)$(2) = $$(PTR$(1)$(2))/bin
-PTL$(1)$(2) = $$(PTR$(1)$(2))/lib
+PTL$(1)$(2) = $$(PTR$(1)$(2))/$(CFG_LIBDIR)
 
 install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
 	$$(Q)mkdir -p $$(PTL$(1)$(2))