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

--- Merging r31943 into '.':

Browse Source 
U    compiler/utils/samplecfg
--- Recording mergeinfo for merge of r31943 into '.':
 U   .

# revisions: 31943

git-svn-id: branches/fixes_3_0@31972 -
This commit is contained in:
joost 2015-10-06 22:19:28 +00:00
parent 683d44e455
commit 6556feef8d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/utils/samplecfg
View File

@ -76,10 +76,7 @@ FPCGLOBALPREFIX=`dirname "$1"`/../../
echo Writing sample configuration file to $fpccfgfile
${FPCMKCFGBIN} -d "basepath=$FPCPATH" -d "sharepath=$SHAREPATH" -o $fpccfgfile
if ! [ -f "$FPBIN" ] ; then
exit
fi
if [ -f "$FPBIN" ] ; then
# Write fp.cfg
echo Writing sample configuration file to $fpcfgfile
${FPCMKCFGBIN} -p -1 -d "basepath=$FPCPATH" -d "sharepath=$SHAREPATH" -o $fpcfgfile
@ -87,6 +84,7 @@ ${FPCMKCFGBIN} -p -1 -d "basepath=$FPCPATH" -d "sharepath=$SHAREPATH" -o $fpcfgf
# Write fp.ini
echo Writing sample configuration file to $fpinifile
${FPCMKCFGBIN} -p -2 -o $fpinifile
fi
# Do not write fppkg configuration when fppkg is not available
if ! [ -f "$FPPKGBIN" ] ; then