From 81e5c6e335b88eed12d8f1e99771e23cc7cb4eb3 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 1 Feb 2006 20:48:50 +0000 Subject: [PATCH] Portable tests for docdir and datadir, comments fixed. Thanks to Havard Tveite for pointing out. git-svn-id: http://svn.osgeo.org/postgis/trunk@2299 b70326c6-7e19-0410-871a-916f4a2858ee --- configure.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index ff6d9b267..4820018bd 100644 --- a/configure.in +++ b/configure.in @@ -342,7 +342,7 @@ if test -z "$pg_docdir"; then pg_docdir=${pg_prefix}'/doc'; fi if test -z "$pg_datadir"; then pg_datadir=${pg_prefix}'/share'; fi if test -z "$pg_mandir"; then pg_mandir=${pg_prefix}'/man'; fi -# Use new layout by default +# Use old layout by default use_new_layout=0 if test "$prefix" != 'NONE'; then @@ -368,12 +368,12 @@ else if test "$docdir" = '${prefix}/share/doc'; then docdir=${pg_docdir} # - # If datadir contains no 'pgsql' or 'postgres' + # If docdir contains no 'pgsql' or 'postgres' # add the suffix. This is derived from # PGSQL_SRC/src/Makefile.global # - if ! expr "${docdir}" : ".*/pgsql" > /dev/null ; then - if ! expr "${docdir}" : ".*/postgres" > /dev/null ; then + if expr "${docdir}" : ".*/pgsql" > /dev/null ; then :; else + if expr "${docdir}" : ".*/postgres" > /dev/null ; then :; else docdir=${docdir}"/postgresql" fi fi @@ -388,8 +388,8 @@ else # add the suffix. This is derived from # PGSQL_SRC/src/Makefile.global # - if ! expr "${datadir}" : ".*/pgsql" > /dev/null ; then - if ! expr "${datadir}" : ".*/postgres" > /dev/null ; then + if expr "${datadir}" : ".*/pgsql" > /dev/null ; then :; else + if expr "${datadir}" : ".*/postgres" > /dev/null ; then :; else datadir=${datadir}"/postgresql" fi fi -- 2.49.0