diff --git a/compiler/utils/samplecfg b/compiler/utils/samplecfg index f5cbf2eb80..15083e24d6 100644 --- a/compiler/utils/samplecfg +++ b/compiler/utils/samplecfg @@ -21,10 +21,10 @@ fi # Detect if we have write permission in root. if [ -w $sysdir ] ; then echo Write permission in $sysdir. - thefile=$sysdir/ppc386.cfg + thefile=$sysdir/fpc.cfg else echo No write premission in $sysdir. - thefile=$HOME/.ppc386.cfg + thefile=$HOME/.fpc.cfg fi # if [ -f $thefile ] ; then @@ -46,7 +46,7 @@ echo Found libgcc.a in $GCCDIR echo Writing sample configuration file to $thefile cat < $thefile # -# Example ppc386.cfg for Free Pascal Compiler +# Example fpc.cfg for Free Pascal Compiler # # ---------------------- diff --git a/install/README b/install/README index b3dc57b06a..c4efda6f0a 100644 --- a/install/README +++ b/install/README @@ -33,7 +33,7 @@ LD linker to use Default: LD=ld RELEASE setting this to a value (for example RELEASE=1) will compile - for a release, no ppc.cfg is read an compile is done with + for a release, no fpc.cfg is read an compile is done with the following settings: '-Xs -OG2p2 -n' VERBOSE setting this to a value (for example VERBOSE=1) will compile diff --git a/install/debian/README.Debian b/install/debian/README.Debian index 8b45ce04e2..ec82d2ec9e 100644 --- a/install/debian/README.Debian +++ b/install/debian/README.Debian @@ -19,9 +19,9 @@ in /etc/texmf/texmf.cnf to use (at least) the specified values: As shipped, only the .pdf docs are built. You may want to make the HTML files with latex2html by yourself, and eventually adapt the doc-base file. -To create a new config file for fpc (/etc/ppc.cfg) use the command: +To create a new config file for fpc (/etc/fpc.cfg) use the command: /usr/lib/fpc/1.0.4/samplecfg /usr/lib/fpc/1.0.4 -However, you should be aware, that said file /etc/ppc.cfg is +However, you should be aware, that said file /etc/fpc.cfg is declared as a conffile since version 1.0.2. Free Vision (fp-fv) had to be removed due to licesing issues. diff --git a/install/debian/fp-compiler.conffiles b/install/debian/fp-compiler.conffiles index d5ee34382a..56f587346a 100644 --- a/install/debian/fp-compiler.conffiles +++ b/install/debian/fp-compiler.conffiles @@ -1 +1 @@ -/etc/ppc386.cfg +/etc/fpc.cfg diff --git a/install/debian/fp-compiler.files.in b/install/debian/fp-compiler.files.in index 68c39ee4f5..f772cf211b 100644 --- a/install/debian/fp-compiler.files.in +++ b/install/debian/fp-compiler.files.in @@ -1,4 +1,4 @@ -/etc/ppc386.cfg +/etc/fpc.cfg /usr/bin/fpc /usr/lib/fpc/%{fpcversion}/ppc386 /usr/lib/fpc/%{fpcversion}/samplecfg @@ -6,4 +6,4 @@ /usr/share/doc/fp-compiler /usr/share/man/man1/fpc.1 /usr/share/man/man1/ppc386.1 -/usr/share/man/man5/ppc386.cfg.5 +/usr/share/man/man5/fpc.cfg.5 diff --git a/install/debian/rules b/install/debian/rules index 5c1b69e0ac..18ab361102 100644 --- a/install/debian/rules +++ b/install/debian/rules @@ -145,7 +145,7 @@ install-arch-stamp: build-arch-stamp debian-files-stamp $(MAKE) demo_install $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler $(MAKE) doc_install $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler -# Create ppc386.cfg which is included as conffile +# Create fpc.cfg which is included as conffile chmod 755 compiler/utils/samplecfg compiler/utils/samplecfg "/usr/lib/fpc/\$$version" $(INSTALL_DIR)/etc touch install-arch-stamp diff --git a/install/fpinst/install.dat b/install/fpinst/install.dat index 7a3a29b202..91bba13b8f 100644 --- a/install/fpinst/install.dat +++ b/install/fpinst/install.dat @@ -20,7 +20,7 @@ pack=Dos/Go~3~2v2 binsub=\bin\go32v2 ppc386=ppc386 targetname=go32v2 -cfgfile=ppc386.cfg +cfgfile=fpc.cfg idecfgfile=fp.cfg ideinifile=fp.ini filecheck=*go32.zip @@ -44,7 +44,7 @@ pack=~W~in32 binsub=\bin\win32 ppc386=ppc386 targetname=win32 -cfgfile=ppc386.cfg +cfgfile=fpc.cfg idecfgfile=fp.cfg ideinifile=fp.ini filecheck=*w32.zip @@ -71,7 +71,7 @@ pack=OS/2 ~E~MX binsub=\bin\os2 ppc386=ppc386 targetname=os2 -cfgfile=ppc386.cfg +cfgfile=fpc.cfg idecfgfile=fp.cfg ideinifile=fp.ini filecheck=*emx.zip @@ -108,7 +108,7 @@ package=docsrc.zip,~D~ocumentation sources (LaTeX) defaultcfg= # -# Example ppc386.cfg for Free Pascal Compiler Version 1.0.2 +# Example fpc.cfg for Free Pascal Compiler Version 1.0.2 # # ---------------------- diff --git a/install/fpinst/install.pas b/install/fpinst/install.pas index 8d093a9b13..7fab672ee9 100644 --- a/install/fpinst/install.pas +++ b/install/fpinst/install.pas @@ -587,7 +587,7 @@ program install; end; {***************************************************************************** - Writing of ppc386.cfg + Writing of fpc.cfg *****************************************************************************} procedure writedefcfg(const fn:string;const cfgdata : tcfgarray;count : longint); @@ -613,7 +613,7 @@ program install; { create directory } fsplit(fn,d,n,e); createdir(d); - { create the ppc386.cfg } + { create the fpc.cfg } assign(t,fn); {$I-} rewrite(t); @@ -1761,7 +1761,10 @@ begin end. { $Log$ - Revision 1.12 2000-11-26 19:00:44 hajny + Revision 1.13 2001-11-24 14:34:10 carl + * ppc386.cfg -> fpc.cfg + + Revision 1.12 2000/11/26 19:00:44 hajny * English correction Revision 1.11 2000/10/11 17:16:01 peter diff --git a/install/fpinst/inststr.pas b/install/fpinst/inststr.pas index bb83bfe15c..dd09c30df8 100644 --- a/install/fpinst/inststr.pas +++ b/install/fpinst/inststr.pas @@ -44,7 +44,7 @@ unit inststr; dialog_install_quit = '~Q~uit'; dialog_install_basepath = '~B~ase path'; dialog_install_config = 'Con~f~ig'; - dialog_install_createppc386cfg = 'create ppc386.cfg'; + dialog_install_createppccfg = 'create fpc.cfg'; dialog_install_general = '~G~eneral'; msg_nocomponents = 'No components selected.'#13#13'Abort installation?'; @@ -94,7 +94,10 @@ unit inststr; end. { $Log$ - Revision 1.4 2000-10-11 15:57:47 peter + Revision 1.5 2001-11-24 14:33:51 carl + * ppc386.cfg -> fpc.cfg + + Revision 1.4 2000/10/11 15:57:47 peter * merged ide additions Revision 1.3 2000/09/22 12:15:49 florian diff --git a/install/install.sh b/install/install.sh index b3c39428e7..eba5d9c829 100644 --- a/install/install.sh +++ b/install/install.sh @@ -179,7 +179,7 @@ if yesno "Install demos"; then fi echo -# Install /etc/ppc386.cfg, this is done using the samplecfg script +# Install /etc/fpc.cfg, this is done using the samplecfg script $LIBDIR/samplecfg $LIBDIR # The End