334197 VPATH interferes with trunk universal build. Build .rsrc in local dir, then symlink into $(DIST)/bin. r=bsmedberg

widget/src/cocoa/Makefile.in

@@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= widget
 LIBRARY_NAME	= widget_mac
-EXPORT_LIBRARY = 1
+EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetMacModule
 XPIDL_MODULE	= widget_cocoa
@@ -175,7 +175,7 @@ $(NIB_DEST):
 $(NIB_DEST)/%: $(srcdir)/resources/MainMenu.nib/% $(NIB_DEST)
 	$(INSTALL) $< $(NIB_DEST)
 
-RES_DEST = $(DIST)/bin/libwidget.rsrc
+RESOURCE = libwidget.rsrc
 RES_SRC = nsMacWidget.r
 
 export:: $(GFX_CPPSRCS) $(MAC_CPP_CSRCS) $(srcdir)/../mac/$(RES_SRC)
@@ -188,10 +188,11 @@ export::
 	ln -fs $(srcdir)/cursors
 endif
 
-$(RES_DEST): $(RES_SRC)
-	/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $(RES_SRC) -o $(RES_DEST)
+$(RESOURCE): $(RES_SRC)
+	/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $< -o $@
 
-libs:: $(RES_DEST)
+libs:: $(RESOURCE)
+	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
 LOCAL_INCLUDES	= \
 	$(TK_CFLAGS) \

widget/src/mac/Makefile.in

@@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= widget
 LIBRARY_NAME	= widget_mac
-EXPORT_LIBRARY = 1
+EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetMacModule
 XPIDL_MODULE	= widget_mac
@@ -152,16 +152,17 @@ GARBAGE		+= $(GFX_LCPPSRCS)
 
 include $(topsrcdir)/config/rules.mk
 
-RES_DEST = $(DIST)/bin/libwidget.rsrc
+RESOURCE = libwidget.rsrc
 RES_SRC = $(srcdir)/nsMacWidget.r
 
 export:: $(addprefix $(topsrcdir)/gfx/src/mac/,$(GFX_LCPPSRCS))
 	$(INSTALL) $^ .
 
-$(RES_DEST): $(RES_SRC)
-	/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $(RES_SRC) -o $(RES_DEST)
+$(RESOURCE): $(RES_SRC)
+	/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $< -o $@
 
-libs:: $(RES_DEST)
+libs:: $(RESOURCE)
+	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
 LOCAL_INCLUDES	= \
 	$(TK_CFLAGS) \