bug 206029 Flash Plugin installer removes line endings from all.js, patch by Steffen Wilberg (steffen.wilberg@web.de), r=bryner
git-svn-id: svn://10.0.0.236/trunk@153790 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
a0eacbb8b3
commit
fbfb155453
@ -1249,11 +1249,16 @@ endif
|
||||
$(DIST)/bin/$(PREF_DIR) $(GRE_DIST)/$(PREF_DIR) $(DESTDIR)$(mozappdir)/$(PREF_DIR):
|
||||
@if test ! -d $@; then echo Creating $@; rm -rf $@; $(NSINSTALL) -D $@; else true; fi
|
||||
|
||||
# on win32, pref files need CRLF line endings... see bug 206029
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
PREF_PPFLAGS = --line-endings=crlf
|
||||
endif
|
||||
|
||||
ifndef NO_DIST_INSTALL
|
||||
export:: $(PREF_JS_EXPORTS) $(PREF_DIST_DIR)/$(PREF_DIR)
|
||||
$(EXIT_ON_ERROR) \
|
||||
for i in $(PREF_JS_EXPORTS); \
|
||||
do $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $$i > $(PREF_DIST_DIR)/$(PREF_DIR)/`basename $$i`; \
|
||||
do $(PERL) $(topsrcdir)/config/preprocessor.pl $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $$i > $(PREF_DIST_DIR)/$(PREF_DIR)/`basename $$i`; \
|
||||
done
|
||||
|
||||
ifdef GRE_MODULE
|
||||
@ -1261,7 +1266,7 @@ ifndef _SKIP_OLD_GRE_INSTALL
|
||||
export:: $(PREF_JS_EXPORTS) $(DIST)/bin/$(PREF_DIR)
|
||||
$(EXIT_ON_ERROR) \
|
||||
for i in $(PREF_JS_EXPORTS); \
|
||||
do $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $$i > $(DIST)/bin/$(PREF_DIR)/`basename $$i`; \
|
||||
do $(PERL) $(topsrcdir)/config/preprocessor.pl $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $$i > $(DIST)/bin/$(PREF_DIR)/`basename $$i`; \
|
||||
done
|
||||
endif
|
||||
endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user