* Fixed problem with samplecfg that did not write the fppkg-configuration files when fp was not installed

git-svn-id: trunk@31943 -
This commit is contained in:
joost 2015-10-04 09:36:07 +00:00
parent 94ff51c67e
commit 8e2a44db88

View File

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