Browse Source

* fixes for STATICLIBPREFIX and ECHO under OS/2

Tomas Hajny 23 years ago
parent
commit
4b825af235
1 changed files with 21 additions and 1 deletions
  1. 21 1
      utils/fpcm/fpcmake.ini

+ 21 - 1
utils/fpcm/fpcmake.ini

@@ -101,6 +101,24 @@ else
 BASEDIR=.
 BASEDIR=.
 endif
 endif
 
 
+# Echo is an internal command under OS/2 (and others), so it's always found
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
+
 [fpcdetect]
 [fpcdetect]
 #####################################################################
 #####################################################################
 # FPC Binary and Version Detection
 # FPC Binary and Version Detection
@@ -669,11 +687,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 ASMEXT=.so2
 OEXT=.oo2
 OEXT=.oo2
 AOUTEXT=.out
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 endif
 
 
 # Amiga
 # Amiga