Browse Source

Restrict use of '-o' option to FPCMAKENEW

Pierre Muller 4 days ago
parent
commit
76162a8106
1 changed files with 7 additions and 2 deletions
  1. 7 2
      utils/fpcm/fpcmake.ini

+ 7 - 2
utils/fpcm/fpcmake.ini

@@ -2032,9 +2032,14 @@ ifdef FPCMAKE
 # a safety check is done if Makefile.fpc is available
 # a safety check is done if Makefile.fpc is available
 ifdef PACKAGE_VERSION
 ifdef PACKAGE_VERSION
 ifneq ($(wildcard Makefile.fpc),)
 ifneq ($(wildcard Makefile.fpc),)
-        $(FPCMAKE) -o Package-$(TARGETSUFFIX).fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
+ifdef FPCMAKENEW
         $(MKDIR) $(INSTALL_UNITDIR)
         $(MKDIR) $(INSTALL_UNITDIR)
-        $(INSTALL) Package-$(TARGETSUFFIX).fpc $(INSTALL_UNITDIR)/Package.fpc
+        $(FPCMAKENEW) -o $(INSTALL_UNITDIR)/Package.fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
+else
+        $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
+        $(MKDIR) $(INSTALL_UNITDIR)
+        $(INSTALL) Package.fpc $(INSTALL_UNITDIR)
+endif
 endif
 endif
 endif
 endif
 endif
 endif