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

diff --git a/configure.in b/configure.in
index ff6d9b26746d6ab80732cd7c54b28440ab68ac77..4820018bd6e5652394c0d0d7151146a66276a344 100644 (file)
--- 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