diff --git a/mozilla/modules/staticmod/meta.mak b/mozilla/modules/staticmod/meta.mak index 4606f8557ed..4d00a63bbee 100755 --- a/mozilla/modules/staticmod/meta.mak +++ b/mozilla/modules/staticmod/meta.mak @@ -56,13 +56,13 @@ include <$(DEPTH)/config/rules.mak> $(SEDCMDS): $(LINK_COMP_NAMES) echo +++make: Creating $@ rm -f $@ - echo s/@COMPONENT_NS_GET_MODULE@/\>> $@ + echo s/%COMPONENT_NS_GET_MODULE%/\>> $@ sed -e "s/\(.*\)/REGISTER_MODULE_USING(\1_NSGetModule);\\\/" $(LINK_COMP_NAMES) >> $@ echo />> $@ - echo s/@COMPONENT_LIST@/\>> $@ + echo s/%COMPONENT_LIST%/\>> $@ sed -e "s/\(.*\)/{ \1_NSGM_comps, \1_NSGM_comp_count },\\\/" $(LINK_COMP_NAMES) >> $@ echo />> $@ - echo s/@DECLARE_COMPONENT_LIST@/\>> $@ + echo s/%DECLARE_COMPONENT_LIST%/\>> $@ sed -e "s/\(.*\)/extern \"C\" nsresult \1_NSGetModule(nsIComponentManager*, nsIFile*, nsIModule**); extern nsModuleComponentInfo* \1_NSGM_comps; extern PRUint32 \1_NSGM_comp_count;\\\/" $(LINK_COMP_NAMES) >> $@ echo />> $@ diff --git a/mozilla/xpfe/bootstrap/makefile.win b/mozilla/xpfe/bootstrap/makefile.win index e32aa7816a5..38d99fd1580 100644 --- a/mozilla/xpfe/bootstrap/makefile.win +++ b/mozilla/xpfe/bootstrap/makefile.win @@ -144,10 +144,10 @@ include <$(DEPTH)\config\rules.mak> $(SEDCMDS): $(FINAL_LINK_COMP_NAMES) rm -f $@ - echo s/@DECLARE_COMPONENTS@/\>> $@ + echo s/%DECLARE_COMPONENTS%/\>> $@ sed -e "s/^/DECL_MODULE(/" -e "s/$$/);\\\/" $(FINAL_LINK_COMP_NAMES) >> $@ echo />> $@ - echo s/@COMPONENT_LIST@/\>> $@ + echo s/%COMPONENT_LIST%/\>> $@ sed -e "s/^/MODULE(/" -e "s/$$/),\\\/" $(FINAL_LINK_COMP_NAMES) >> $@ echo />> $@