From f466cf8c5f7c114fc9c61ca6679e43173f6cc51a Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Thu, 8 Mar 2007 02:18:22 +0000 Subject: [PATCH] Bug 372593 - Metrics (and mbsdiff) don't link because they can't find libbz2, r=luser git-svn-id: svn://10.0.0.236/trunk@221517 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/metrics/build/Makefile.in | 2 +- mozilla/extensions/metrics/test/Makefile.in | 2 +- mozilla/other-licenses/bsdiff/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/extensions/metrics/build/Makefile.in b/mozilla/extensions/metrics/build/Makefile.in index 3d4200f775b..76c04fc68df 100644 --- a/mozilla/extensions/metrics/build/Makefile.in +++ b/mozilla/extensions/metrics/build/Makefile.in @@ -61,7 +61,7 @@ CPPSRCS = \ SHARED_LIBRARY_LIBS = \ ../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ + $(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ $(NULL) EXTRA_DSO_LDOPTS = $(XPCOM_GLUE_LDOPTS) \ diff --git a/mozilla/extensions/metrics/test/Makefile.in b/mozilla/extensions/metrics/test/Makefile.in index f7d140d2825..71865ab7d1e 100644 --- a/mozilla/extensions/metrics/test/Makefile.in +++ b/mozilla/extensions/metrics/test/Makefile.in @@ -67,7 +67,7 @@ LOCAL_INCLUDES = \ LIBS = \ ../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ + $(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/other-licenses/bsdiff/Makefile.in b/mozilla/other-licenses/bsdiff/Makefile.in index f1f8cf0b768..622027e6a22 100644 --- a/mozilla/other-licenses/bsdiff/Makefile.in +++ b/mozilla/other-licenses/bsdiff/Makefile.in @@ -47,7 +47,7 @@ include $(DEPTH)/config/autoconf.mk # build system and is not intended to be included in Mozilla distributions. HOST_PROGRAM = mbsdiff$(BIN_SUFFIX) HOST_CSRCS = bsdiff.c -HOST_LIBS += $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) +HOST_LIBS += $(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) ifeq (WINNT,$(OS_ARCH)) HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)