--- configure.org	Sat Jul 10 20:20:09 2004
+++ configure	Sat Jul 17 15:57:45 2004
@@ -306,18 +306,18 @@
 if test -z "$prefix" ; then
     prefix="/c/Program Files/Qemu"
 fi
-mandir="$prefix"
-datadir="$prefix"
-docdir="$prefix"
-bindir="$prefix"
+mandir="\${prefix}"
+datadir="\${prefix}"
+docdir="\${prefix}"
+bindir="\${prefix}"
 else
 if test -z "$prefix" ; then
     prefix="/usr/local"
 fi
-mandir="$prefix/share/man"
-datadir="$prefix/share/qemu"
-docdir="$prefix/share/doc/qemu"
-bindir="$prefix/bin"
+mandir="\${prefix}/share/man"
+datadir="\${prefix}/share/qemu"
+docdir="\${prefix}/share/doc/qemu"
+bindir="\${prefix}/bin"
 fi
 
 echo "Install prefix    $prefix"
@@ -360,12 +360,11 @@
 echo "# Automatically generated by configure - do not modify" > $config_mak
 echo "/* Automatically generated by configure - do not modify */" > $config_h
 
-echo "prefix=$prefix" >> $config_mak
 echo "bindir=$bindir" >> $config_mak
 echo "mandir=$mandir" >> $config_mak
 echo "datadir=$datadir" >> $config_mak
 echo "docdir=$docdir" >> $config_mak
-echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h
+echo "#define CONFIG_QEMU_SHAREDIR \"$prefix/share/qemu\"" >> $config_h
 echo "MAKE=$make" >> $config_mak
 echo "CC=$cc" >> $config_mak
 if test "$have_gcc3_options" = "yes" ; then