diff options
Diffstat (limited to 'make/otp.mk.in')
| -rw-r--r-- | make/otp.mk.in | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index d74220588c..90f448d4a0 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -77,19 +77,13 @@ OTP_RELEASE = @OTP_RELEASE@ # Erlang language section # ---------------------------------------------------- EMULATOR = beam -ifeq ($(findstring vxworks,$(TARGET)),vxworks) -# VxWorks object files should be compressed. -# Other object files should have debug_info. - ERL_COMPILE_FLAGS += +compressed +ifeq ($(findstring ose_ppc750,$(TARGET)),ose_ppc750) +ERL_COMPILE_FLAGS += +compressed else - ifeq ($(findstring ose_ppc750,$(TARGET)),ose_ppc750) - ERL_COMPILE_FLAGS += +compressed + ifdef BOOTSTRAP + ERL_COMPILE_FLAGS += +slim else - ifdef BOOTSTRAP - ERL_COMPILE_FLAGS += +slim - else - ERL_COMPILE_FLAGS += +debug_info - endif + ERL_COMPILE_FLAGS += +debug_info endif endif ERLC_WFLAGS = -W @@ -258,6 +252,7 @@ XSLTPROC = @XSLTPROC@ FOP = @FOP@ DOCGEN=$(ERL_TOP)/lib/erl_docgen +FOP_CONFIG = $(DOCGEN)/priv/fop.xconf ifneq (,$(findstring $(origin SPECS_ESRC),$(DUBIOUS_ORIGINS))) SPECS_ESRC = ../../src @@ -314,5 +309,5 @@ $(MAN9DIR)/%.9: %.xml escript $(DOCGEN)/priv/bin/codeline_preprocessing.escript $< $@ .fo.pdf: - $(FOP) -fo $< -pdf $@ + $(FOP) -c $(FOP_CONFIG) -fo $< -pdf $@ |