|
@@ -44,15 +44,6 @@ inWinNT=1
|
|
|
endif
|
|
|
endif
|
|
|
|
|
|
-# Detect OS/2 - OS/2 has OS2_SHELL defined
|
|
|
-ifndef inlinux
|
|
|
-ifndef inWinNT
|
|
|
-ifdef OS2_SHELL
|
|
|
-inOS2=1
|
|
|
-endif
|
|
|
-endif
|
|
|
-endif
|
|
|
-
|
|
|
# The extension of executables
|
|
|
ifdef inlinux
|
|
|
EXEEXT=
|
|
@@ -80,12 +71,8 @@ endif
|
|
|
|
|
|
# What compiler to use ?
|
|
|
ifndef PP
|
|
|
-ifdef inOS2
|
|
|
-PP=ppos2$(EXEEXT)
|
|
|
-else
|
|
|
PP=ppc386$(EXEEXT)
|
|
|
endif
|
|
|
-endif
|
|
|
|
|
|
# Target OS
|
|
|
ifndef OS_TARGET
|
|
@@ -195,12 +182,8 @@ endif
|
|
|
ifdef inlinux
|
|
|
PPAS=ppas.sh
|
|
|
else
|
|
|
-ifdef inOS2
|
|
|
-PPAS=ppas.cmd
|
|
|
-else
|
|
|
PPAS=ppas.bat
|
|
|
endif
|
|
|
-endif
|
|
|
|
|
|
# The path which is search separated by spaces
|
|
|
ifdef inlinux
|
|
@@ -393,11 +376,7 @@ endif
|
|
|
|
|
|
# Where the .msg files will be stored
|
|
|
ifndef MSGINSTALLDIR
|
|
|
-ifdef inlinux
|
|
|
MSGINSTALLDIR=$(BASEINSTALLDIR)/msg
|
|
|
-else
|
|
|
-MSGINSTALLDIR=$(BININSTALLDIR)
|
|
|
-endif
|
|
|
endif
|
|
|
|
|
|
# Where the .msg files will be stored
|
|
@@ -675,7 +654,7 @@ UNITAFILES=$(addsuffix $(STATICLIBEXT),$(UNITOBJECTS))
|
|
|
fpc_info fpc_cfginfo fpc_objectinfo fpc_installinfo fpc_filesinfo\
|
|
|
fpc_dirinfo
|
|
|
|
|
|
-.SUFFIXES : $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
|
|
|
+.SUFFIXES : $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
|
|
|
|
|
|
|
|
|
#####################################################################
|
|
@@ -732,11 +711,11 @@ fpc_sharedlib:
|
|
|
ifdef inlinux
|
|
|
ifndef LIBNAME
|
|
|
$(ECHO) LIBNAME not set
|
|
|
-else
|
|
|
+else
|
|
|
$(MAKE) libsclean
|
|
|
$(MAKE) all
|
|
|
$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
|
|
|
-endif
|
|
|
+endif
|
|
|
else
|
|
|
@$(ECHO) Shared Libraries not supported
|
|
|
endif
|
|
@@ -1029,11 +1008,8 @@ endif
|
|
|
|
|
|
#
|
|
|
# $Log$
|
|
|
-# Revision 1.32 1999-06-11 13:31:14 hajny
|
|
|
-# * fixes for OS/2
|
|
|
-#
|
|
|
-# Revision 1.31 1999/06/10 15:02:08 peter
|
|
|
-# * last fixes for 0.99.12 release
|
|
|
+# Revision 1.31.2.1 1999-06-13 22:36:38 peter
|
|
|
+# * install msg files in msg/ instead of bin for not linux
|
|
|
#
|
|
|
# Revision 1.30 1999/06/03 09:36:31 peter
|
|
|
# * first things for sharedlib to work again
|