paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 18:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* merged

Browse Source
This commit is contained in:
peter 1999-06-18 10:11:18 +00:00
parent c261796ebf
commit 6bdc4bbbeb
2 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base/makefile.fpc
View File

@ -421,12 +421,8 @@ endif
# set the directory where to install the units.
ifndef UNITINSTALLDIR
ifdef inlinux
UNITINSTALLDIR=$(BASEINSTALLDIR)/$(UNITPREFIX)
else
UNITINSTALLDIR=$(BASEINSTALLDIR)/$(UNITPREFIX)/$(OS_TARGET)
endif
endif
# set the directory where to install the units.
ifndef STATIC_UNITINSTALLDIR
@ -1025,12 +1021,18 @@ endif
#
# $Log$
# Revision 1.33 1999-06-13 22:43:23 peter
# Revision 1.34 1999-06-18 10:11:18 peter
# * merged
#
# Revision 1.33 1999/06/13 22:43:23 peter
# * merged from fixes
#
# Revision 1.32 1999/06/11 13:31:14 hajny
# * fixes for OS/2
#
# Revision 1.31.2.2 1999/06/18 10:07:27 peter
# * rtl/linux and units/linux also for linux installs
#
# Revision 1.31.2.1 1999/06/13 22:36:38 peter
# * install msg files in msg/ instead of bin for not linux
#

61
compiler/utils/samplecfg
View File

@ -138,22 +138,55 @@ cat <<EOFCFG > /etc/ppc386.cfg
# searchpath for includefiles
#-Fi/pp/inc;/pp/rtl/inc
# searchpath for units (does the same as -Up)
# For statically, smartlinked units
#IFDEF FPC_LINK_STATIC
-Fu$1/rtl/static
-Fu$1/units/static
# searchpath for units and other system dependent things
#IFDEF Go32V1
#IFDEF FPC_LINK_STATIC
-Fu$1/rtl/go32v1/static
-Fu$1/units/go32v1/static
#ENDIF
-Fu$1/rtl/go32v1
-Fu$1/units/go32v1
#ENDIF
# For Dynamically linked units
#IFDEF FPC_LINK_DYNAMIC
-Fu$1/rtl/shared
-Fu$1/units/shared
#IFDEF Go32V2
#IFDEF FPC_LINK_STATIC
-Fu$1/rtl/go32v2/static
-Fu$1/units/go32v2/static
#ENDIF
-Fu$1/rtl/go32v2
-Fu$1/units/go32v2
#ENDIF
#IFDEF Win32
#IFDEF FPC_LINK_STATIC
-Fu$1/rtl/win32/static
-Fu$1/units/win32/static
#ENDIF
-Fu$1/rtl/win32
-Fu$1/units/win32
#ENDIF
#IFDEF OS2
#IFDEF FPC_LINK_STATIC
-Fu$1/rtl/os2/static
-Fu$1/units/os2/static
#ENDIF
-Fu$1/rtl/os2
-Fu$1/units/os2
#ENDIF
#IFDEF Linux
# For statically, smartlinked units
#IFDEF FPC_LINK_STATIC
-Fu$1/rtl/static
-Fu$1/units/static
#ENDIF
# For Dynamically linked units
#IFDEF FPC_LINK_DYNAMIC
-Fu$1/rtl/shared
-Fu$1/units/shared
#ENDIF
-Fu$1/rtl/linux
-Fu$1/units/linux
#-Fu~/pp/units;~/pp/rtl/linux
#-Fu/usr/lib/fpc/0.99.12/units;/usr/lib/fpc/0.99.12/rtl
#ENDIF
# For normal units
-Fu$1/rtl
-Fu$1/units
#-Fu/pp/units;/pp/rtl/dos/go32v2
#-Fu/usr/lib/ppc/units;/usr/lib/ppc/linuxunits
# searchpath for libraries
-Fl$GCCDIR