Bug 78081 - don't export intermediate libraries - initial makefile changes to switch from $(DIST)/lib to in-tree library locations - blanket-r=mento

extensions/pref/system-pref/src/gconf/Makefile.in

@@ -57,7 +57,7 @@ CPPSRCS =   \
 	nsSystemPrefFactory.cpp \
 	$(NULL)
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libsystem-pref_s.a
+SHARED_LIBRARY_LIBS = ../libsystem-pref_s.a
 
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \

extensions/universalchardet/src/xpcom/Makefile.in

@@ -71,7 +71,7 @@ CPPSRCS = \
 LOCAL_INCLUDES = -I$(srcdir)/../base
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \
+		../base/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS += \

extensions/universalchardet/tests/Makefile.in

@@ -61,7 +61,7 @@ include $(topsrcdir)/config/config.mk
 
 LIBS		+= \
 		$(LIBS_DIR) \
-		$(DIST)/lib/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \
+		../src/base/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \
 		$(NSPR_LIBS) \
 		$(NULL)