From 7341dc8ca1b3b6b7afcbd540f87efb9f4340b7c7 Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Fri, 22 Mar 2002 06:47:00 +0000 Subject: [PATCH] Make embedding/config both objdir & win32 gmake aware. --- embedding/config/Makefile.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/embedding/config/Makefile.in b/embedding/config/Makefile.in index 2cb285a68723..c0e374d78231 100644 --- a/embedding/config/Makefile.in +++ b/embedding/config/Makefile.in @@ -28,13 +28,17 @@ include $(topsrcdir)/config/rules.mk ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) BASEBROWSER = basebrowser-mac-macho +else +ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) + BASEBROWSER = basebrowser-win else BASEBROWSER = basebrowser-unix endif +endif embed_chrome: embed-jar.mn ifneq (jar,$(MOZ_CHROME_FILE_FORMAT)) - $(PERL) $(MOZILLA_DIR)/embedding/config/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/bin/chrome > $(MOZILLA_DIR)/embedding/config/embed-tmp.mn + $(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/bin/chrome > $(MOZILLA_DIR)/embedding/config/embed-tmp.mn $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/bin/chrome < $(MOZILLA_DIR)/embedding/config/embed-tmp.mn -$(RM) -f $(MOZILLA_DIR)/embedding/config/embed-tmp.mn else @@ -45,7 +49,7 @@ else $(NSINSTALL) -D $(DIST)/Embed/tmpchrome/$$b ;\ unzip -o -d $(DIST)/Embed/tmpchrome/$$b $$f ; \ done - $(PERL) $(MOZILLA_DIR)/embedding/config/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/Embed/tmpchrome > $(MOZILLA_DIR)/embedding/config/embed-tmp.mn + $(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/Embed/tmpchrome > $(MOZILLA_DIR)/embedding/config/embed-tmp.mn $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/Embed/tmpchrome < $(MOZILLA_DIR)/embedding/config/embed-tmp.mn -$(RM) -f $(MOZILLA_DIR)/embedding/config/embed-tmp.mn -$(RM) -rf $(DIST)/Embed/tmpchrome