mktmpl.sh: add pkg-config dependency if the user sets .pc files.

Minor nits too.

--HG--
extra : convert_revision : 6ff4dcca5bb5ffebc503d7c039e70e84f1ed3abc
This commit is contained in:
Juan RP 2008-10-01 05:11:26 +02:00
parent fbcab43d84
commit d53b7c6dd3

View file

@ -110,6 +110,8 @@ write_new_template()
for i in $required_deps; do for i in $required_deps; do
deps="$i $deps" deps="$i $deps"
done done
[ -n "$pcfiles" ] && deps="pkg-config-0.23 $deps"
$db_cmd -C -P 512 -w btree $depsdir/$pkg-deps.db deps \ $db_cmd -C -P 512 -w btree $depsdir/$pkg-deps.db deps \
"$deps" 2>&1 >/dev/null "$deps" 2>&1 >/dev/null
[ "$?" -ne 0 ] && \ [ "$?" -ne 0 ] && \
@ -148,6 +150,7 @@ read_parameters()
echo "What's the build style for this template?" echo "What's the build style for this template?"
echo -n "(g)nu_configure, (c)onfigure: " echo -n "(g)nu_configure, (c)onfigure: "
read build_style read build_style
echo
if [ -z "$build_style" ]; then if [ -z "$build_style" ]; then
echo " -- Empty value --" echo " -- Empty value --"
@ -168,6 +171,7 @@ read_parameters()
echo -n "Requires GNU make this package? (y) or (n): " echo -n "Requires GNU make this package? (y) or (n): "
read dep_gmake read dep_gmake
echo
[ "$dep_gmake" = "y" ] && \ [ "$dep_gmake" = "y" ] && \
required_deps="gmake-3.81 $required_deps" required_deps="gmake-3.81 $required_deps"
[ "$dep_gmake" = "n" ] && dep_gmake= [ "$dep_gmake" = "n" ] && dep_gmake=
@ -179,6 +183,7 @@ read_parameters()
echo "yes before..." echo "yes before..."
echo -n "> " echo -n "> "
read deps read deps
echo
[ -z "$deps" ] && echo "No dependencies, continuing..." [ -z "$deps" ] && echo "No dependencies, continuing..."
echo "Will this package install pkg-config files?" echo "Will this package install pkg-config files?"
@ -188,20 +193,24 @@ read_parameters()
echo "Alternatively press the enter key to ignore this question." echo "Alternatively press the enter key to ignore this question."
echo -n "> " echo -n "> "
read pcfiles read pcfiles
echo
echo "Enter full URL to download the distfile: " echo "Enter full URL to download the distfile: "
echo -n "> " echo -n "> "
read url read url
echo
[ -z "$url" ] && echo " -- Empty value --" && exit 1 [ -z "$url" ] && echo " -- Empty value --" && exit 1
echo "Enter short description (max 72 characters):" echo "Enter short description (max 72 characters):"
echo -n "> " echo -n "> "
read short_desc read short_desc
echo
echo "Enter maintainer for this package, e.g: Anon <ymous.org>:" echo "Enter maintainer for this package, e.g: Anon <ymous.org>:"
echo "Alternatively press enter to ignore this question." echo "Alternatively press enter to ignore this question."
echo -n "> " echo -n "> "
read maintainer read maintainer
echo
write_new_template write_new_template
} }