tazwok diff examples/config.site @ rev 496

Fixed check_for_pkg_in_wok function in tazwok. I made sure it checked provided receipt existed before returning 1. This should fix the errors like 'can't fine jdk in wok or mirror'.
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Apr 26 04:54:53 2011 +0000 (2011-04-26)
parents 919becf8fe71
children cdab17eb0dc9 44e24b12e9dd
line diff
     1.1 --- a/examples/config.site	Thu Feb 24 01:41:30 2011 +0100
     1.2 +++ b/examples/config.site	Tue Apr 26 04:54:53 2011 +0000
     1.3 @@ -1,33 +1,33 @@
     1.4 -# This file contains default option passed to ./configure at compile time.
     1.5 -# Variables are setted this way :
     1.6 +# This file contains default options passed to ./configure at compile time.
     1.7 +# Variables are set this way :
     1.8  # { [ "$var" = NONE ] || [ ! "$var" ] ; } && var=
     1.9 -# This is because config.site overwrite options passed directly in
    1.10 +# This is because config.site overwrites options passed directly in
    1.11  # configure, like ./configure --var=
    1.12  #
    1.13 -# Here, we don't want overwrite default configuration : we want to
    1.14 -# setup configure with default path only if nothing has been given
    1.15 +# Here, we don't want to overwrite the default configuration : we want to
    1.16 +# setup configure with a default path only if nothing has been given
    1.17  # on the configure command-line. This allow contributors to overwrite
    1.18 -# the defaults path filled here in the recipes.
    1.19 +# the default paths filled here by the recipes.
    1.20  #
    1.21 -# Path to the config.site is given to configure using the environnment
    1.22 +# Path to the config.site is given to configure using the environment
    1.23  # variable CONFIG_SITE
    1.24  # tazwok does that work before executing compile rules.
    1.25  #
    1.26 -# If you want to use you're own config.site, you can use :
    1.27 +# If you want to use your own config.site, you can use :
    1.28  # export CONFIG_SITE=path_to_my_config.site
    1.29  # in the compilation_rules of a receipt.
    1.30 -# It can be usefull if you want to share default configuration between
    1.31 +# It can be useful if you want to share a default configuration between
    1.32  # some groups of packages like GNOME or KDE ones.
    1.33  #
    1.34 -# To make tazwok configuration easier, we use variable from
    1.35 -# /etc/tazwok.conf here. Note that only concerns configure options :
    1.36 +# To make tazwok configuration easier, we use variables from
    1.37 +# /etc/tazwok.conf here. Note this only concerns configure options :
    1.38  # make flags (MAKEFLAGS, CFLAGS, CXXFLAGS and DESTDIR) are exported
    1.39 -# to environment variables; options setted here are thoses we can't
    1.40 -# export in environnment variables because it doesn't works.
    1.41 +# to environment variables; options set here are those we can't
    1.42 +# export environnment variables to because they don't work.
    1.43  
    1.44  # Some variable are prefixed by "${prefix}" instead of "${datarootdir}".
    1.45 -# For thoses case we use "${datadir}" because there's configure script
    1.46 -# generally don't know about "${datarootdir}" (too olds). 
    1.47 +# For those cases we use "${datadir}" because the configure script
    1.48 +# generally doesn't know about "${datarootdir}" (too old). 
    1.49  if echo "$localedir" | grep -q \${prefix}; then
    1.50  	localedir=$( echo "$localedir" | sed 's/${prefix}/${datarootdir}/')
    1.51  fi
    1.52 @@ -38,7 +38,7 @@
    1.53  	mandir=$( echo "$mandir" | sed 's/${prefix}/${datarootdir}/')
    1.54  fi
    1.55  
    1.56 -# Use default values if one of theses configure variable is not set.
    1.57 +# Use default values if one of these configure variables is not set.
    1.58  { [ "$prefix" = NONE ] || [ ! "$prefix" ] ; } && prefix=$default_prefix
    1.59  { [ "$datarootdir" = NONE ] || [ ! "$datarootdir" ] ; } && datarootdir=$default_datarootdir
    1.60  { [ "$datadir" = NONE ] || [ ! "$datadir" ] ; } && datadir=$datarootdir
    1.61 @@ -48,7 +48,7 @@
    1.62  { [ "$build" = NONE ] || [ ! "$build" ] ; } && build=$default_build
    1.63  { [ "$host" = NONE ] || [ ! "$host" ] ; } && host=$default_host
    1.64  
    1.65 -# Print information about theses variables.
    1.66 +# Print information about these variables.
    1.67  echo "prefix = $prefix
    1.68  datarootdir = $datarootdir
    1.69  datadir = $datadir
    1.70 @@ -59,5 +59,5 @@
    1.71  host = $host
    1.72  "
    1.73  
    1.74 -# config.site is used by tazwok to check that config.site script has been used.
    1.75 +# config.site is used by tazwok to check that the config.site script has been used.
    1.76  touch /tmp/config.site