reverted the last fix, it was just wrong, sorry, the problem is elsewhere

[wxWidgets.git] / wx-config-inplace.in

diff --git a/wx-config-inplace.in b/wx-config-inplace.in
index 1997b87effc28b55b07cca0b577ce1d730de0fed..a95d45f30f1bdf5ba708622af43a072c2a85cf83 100644 (file)
--- a/wx-config-inplace.in
+++ b/wx-config-inplace.in
@@ -3,16 +3,16 @@
 # Name:        wx-config-inplace
 # Purpose:     wx configuration in tree search and query tool
 # Author:      Ron <ron@debian.org>
 # Name:        wx-config-inplace
 # Purpose:     wx configuration in tree search and query tool
 # Author:      Ron <ron@debian.org>

-# Modified by:
+# Modified by: VZ on 2005-09-20 to make it work with Bourne shell

 # Created:     14/9/2004
 # RCS-ID:      $Id$
 # Copyright:   (c) 2004 Ron <ron@debian.org>
 # Licence:     wxWindows licence
 ############################################################################
 
 # Created:     14/9/2004
 # RCS-ID:      $Id$
 # Copyright:   (c) 2004 Ron <ron@debian.org>
 # Licence:     wxWindows licence
 ############################################################################
 

-# Not much to do here.  Just initialise some variables to point things
-# into the local tree by default and then source the real wx-config if
-# it all still looks sane.  It typically should be if you got this far.
+# Not much to do here.  Just initialise prefix to point things into the
+# local tree by default and then source the real wx-config if it all still
+# looks sane.

 
 check_dirname()
 {
 
 check_dirname()
 {


@@ -24,9 +24,16 @@ check_dirname()
     ( cd $1 && pwd )
 }
 
     ( cd $1 && pwd )
 }
 

-this_prefix=$(check_dirname "@abs_top_srcdir@")         || exit
-this_exec_prefix=$(check_dirname "@abs_top_builddir@")  || exit
-flag_option_inplace=yes
+# set the variables which allow the real wx-config to check if we're using it
+# in place or after installation
+this_prefix=`check_dirname "@abs_top_srcdir@"`
+if [ "x$this_prefix" = "x" ]; then
+    exit 1
+fi
+this_exec_prefix=`check_dirname "@abs_top_builddir@"`
+if [ "x$this_exec_prefix" = "x" ]; then
+    exit 1
+fi

 
 . "$this_exec_prefix/lib/wx/config/@TOOLCHAIN_FULLNAME@"
 
 
 . "$this_exec_prefix/lib/wx/config/@TOOLCHAIN_FULLNAME@"