diff --git a/rtl/Makefile b/rtl/Makefile index dd0352d80b..138960041a 100644 --- a/rtl/Makefile +++ b/rtl/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:58 +# Makefile generated by fpcmake v0.99.13 on 1999-12-13 14:21 # defaultrule: all @@ -65,12 +65,17 @@ endif # What compiler to use ? ifndef FPC +# Compatibility with old makefiles +ifdef PP +export FPC=$(PP) +else ifdef inOS2 export FPC=ppos2$(EXEEXT) else export FPC=ppc386$(EXEEXT) endif endif +endif # Target OS ifndef OS_TARGET @@ -148,6 +153,9 @@ ZIPTARGET=install ifndef PACKAGEDIR PACKAGEDIR=$(FPCDIR)/packages endif +ifndef COMPONENTDIR +COMPONENTDIR=$(FPCDIR)/components +endif # Packages @@ -195,15 +203,15 @@ info: $(OS_TARGET)_info # Package depends ##################################################################### -ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),) -ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),) +ifneq ($(wildcard $(RTLDIR)),) +ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),) override COMPILEPACKAGES+=rtl rtl_package: - $(MAKE) -C $(RTLDIR)/$(OS_TARGET) all + $(MAKE) -C $(RTLDIR) all endif endif -.PHONY: $(OS_TARGET)_package +.PHONY: rtl_package # Target Dirs