--- configure.orig	Fri May 19 14:49:06 2000
+++ configure	Tue May 30 13:31:24 2000
@@ -5101,7 +5101,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   CATOBJEXT=.mo
-		   DATADIRNAME=lib
+		   DATADIRNAME=share
 fi
 rm -f conftest*
 		INSTOBJEXT=.mo
@@ -6350,17 +6350,13 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   build_gfloppy=true
+  subdirs="gfloppy"
 else
+  build_gfloppy=false
   echo "$ac_t""no" 1>&6
 echo "configure: warning: *** gfloppy will not be built." 1>&2
 fi
 
-if $build_gfloppy; then
-  subdirs="gfloppy"
-
-fi
-
-
 if test "$build_gfloppy" = true; then
   BUILD_GFLOPPY_TRUE=
   BUILD_GFLOPPY_FALSE='#'
@@ -8453,7 +8449,7 @@
     esac
   done
 
-  for ac_config_dir in gfloppy; do
+  for ac_config_dir in $subdirs ; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.