From bccc6db38092267faca0fd3a3a1b0c228b6940e2 Mon Sep 17 00:00:00 2001 From: "duncan%be.com" Date: Sun, 11 Jul 1999 09:51:51 +0000 Subject: [PATCH] Changes to get BeOS tinderbox to work. BeOS only changes authorized by cyeh. --- config/rules.mk | 2 +- webshell/tests/viewer/Makefile.in | 2 +- xpfe/bootstrap/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index 3c3a209d899c..fcede600d667 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -454,7 +454,7 @@ ifdef SHARED_LIBRARY # BeOS specific section: link against dependant shared libs # BEOS_LIB_LIST = $(shell cat $(topsrcdir)/dependencies.beos/$(LIBRARY_NAME).dependencies) -BEOS_LINK_LIBS = $(foreach lib,$(BEOS_LIB_LIST),$(shell $(topsrcdir)/config/beos/checklib.sh $(topsrcdir)/dist/bin $(lib))) +BEOS_LINK_LIBS = $(foreach lib,$(BEOS_LIB_LIST),$(shell $(topsrcdir)/config/beos/checklib.sh $(DIST)/bin $(lib))) LDFLAGS += -L$(DIST)/bin $(BEOS_LINK_LIBS) $(NSPR_LIBS) EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(BEOS_LINK_LIBS) $(NSPR_LIBS) endif diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in index 9f6cffa5ce09..15bbe3292f6f 100644 --- a/webshell/tests/viewer/Makefile.in +++ b/webshell/tests/viewer/Makefile.in @@ -75,7 +75,7 @@ TOOLKIT_CPPSRCS_xlib := \ ifeq ($(MOZ_WIDGET_TOOLKIT),beos) -BEOS_PROGRAM_RESOURCE = viewer-beos.rsrc +BEOS_PROGRAM_RESOURCE = $(srcdir)/viewer-beos.rsrc endif TOOLKIT_CPPSRCS := $(TOOLKIT_CPPSRCS_$(MOZ_WIDGET_TOOLKIT)) diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in index acbe1437e1d9..96e1bf96980c 100644 --- a/xpfe/bootstrap/Makefile.in +++ b/xpfe/bootstrap/Makefile.in @@ -26,7 +26,7 @@ MODULE = apprunner include $(DEPTH)/config/autoconf.mk ifeq ($(MOZ_WIDGET_TOOLKIT),beos) -BEOS_PROGRAM_RESOURCE = apprunner-beos.rsrc +BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc endif ifndef NECKO