From 77760a0e0da8cd39a136b98a6924746b2c6c59d8 Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Mon, 20 Apr 2009 14:51:26 -0400 Subject: [PATCH] bug 489073 - race condition with nsinstall in toolkit/mozapps/plugins/tests Makefile. r=mossop --- toolkit/mozapps/plugins/tests/Makefile.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/toolkit/mozapps/plugins/tests/Makefile.in b/toolkit/mozapps/plugins/tests/Makefile.in index 83a9c75a06d8..f773c9477d93 100644 --- a/toolkit/mozapps/plugins/tests/Makefile.in +++ b/toolkit/mozapps/plugins/tests/Makefile.in @@ -66,11 +66,14 @@ PROGRAMS = $(SIMPLE_PROGRAMS:%$(BIN_SUFFIX)=$(TESTROOT)/%) include $(topsrcdir)/config/rules.mk -$(PROGRAMS): $(TESTROOT)/% : %$(BIN_SUFFIX) - $(NSINSTALL) -D $(TESTROOT) - cp $^ $@ +$(PROGRAMS) $(_BROWSER_FILES): $(TESTROOT) +$(TESTROOT): + $(NSINSTALL) -D $@ -libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(TESTROOT) +$(PROGRAMS): $(TESTROOT)/% : %$(BIN_SUFFIX) + cp $< $@ + +libs:: + $(INSTALL) $(foreach f,$(_BROWSER_FILES),"$(srcdir)/$f") $(TESTROOT) libs:: $(PROGRAMS)