From e7949e50fdf8770908533f3192b1b6eac2dc06c6 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 3 Mar 2015 17:49:56 +0900
Subject: [PATCH] Bug 1138824 - Don't install import libraries in $(DIST)/lib.
 r=gps

However, still keep copying nss there, because its build system needs it to link
programs such as certutil.
---
 config/external/nss/Makefile.in     |  6 ++++++
 config/makefiles/target_binaries.mk | 20 --------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in
index b633790ffc4..16d214e8af1 100644
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -130,6 +130,7 @@ ifdef MOZ_FOLD_LIBS
 DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=nss3
 else
 DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3
+DEFAULT_GMAKE_FLAGS += SQLITE_LIB_DIR=$(ABS_DIST)/../config/external/sqlite
 endif # MOZ_FOLD_LIBS
 DEFAULT_GMAKE_FLAGS += SQLITE_INCLUDE_DIR=$(ABS_DIST)/include
 endif
@@ -357,6 +358,11 @@ GARBAGE += \
 endif # GCC_USE_GNU_LD
 endif # WINNT
 
+IMPORT_LIB_FILES = $(IMPORT_LIBRARY)
+IMPORT_LIB_DEST ?= $(DIST)/lib
+IMPORT_LIB_TARGET = target
+INSTALL_TARGETS += IMPORT_LIB
+
 endif # MOZ_FOLD_LIBS
 
 include $(topsrcdir)/config/rules.mk
diff --git a/config/makefiles/target_binaries.mk b/config/makefiles/target_binaries.mk
index b4e406af4f1..977f33ac256 100644
--- a/config/makefiles/target_binaries.mk
+++ b/config/makefiles/target_binaries.mk
@@ -31,11 +31,6 @@ ifdef LIBRARY
 ifdef DIST_INSTALL
 ifdef IS_COMPONENT
 $(error Shipping static component libs makes no sense.)
-else
-DIST_LIBRARY_FILES = $(LIBRARY)
-DIST_LIBRARY_DEST ?= $(DIST)/lib
-DIST_LIBRARY_TARGET = target
-INSTALL_TARGETS += DIST_LIBRARY
 endif
 endif # DIST_INSTALL
 endif # LIBRARY
@@ -47,14 +42,6 @@ SHARED_LIBRARY_FILES = $(SHARED_LIBRARY)
 SHARED_LIBRARY_DEST ?= $(FINAL_TARGET)
 SHARED_LIBRARY_TARGET = target
 INSTALL_TARGETS += SHARED_LIBRARY
-
-ifdef IMPORT_LIBRARY
-IMPORT_LIB_FILES = $(IMPORT_LIBRARY)
-IMPORT_LIB_DEST ?= $(DIST)/lib
-IMPORT_LIB_TARGET = target
-INSTALL_TARGETS += IMPORT_LIB
-endif
-
 endif # ! IS_COMPONENT
 endif # SHARED_LIBRARY
 
@@ -65,13 +52,6 @@ HOST_PROGRAMS_TARGET = host
 INSTALL_TARGETS += HOST_PROGRAMS
 endif
 
-ifdef HOST_LIBRARY
-HOST_LIBRARY_FILES = $(HOST_LIBRARY)
-HOST_LIBRARY_DEST ?= $(DIST)/host/lib
-HOST_LIBRARY_TARGET = host
-INSTALL_TARGETS += HOST_LIBRARY
-endif
-
 endif # !NO_DIST_INSTALL
 
 # EOF