configure: change meaning of --datadir to Autoconf convention
Autoconf uses --datadir for the /usr/share directory, not the
program-specific subdirectory inside /usr/share. This changes configure
to match autoconf behavior.
Note that this will break compatibility with existing build scripts.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
diff --git a/configure b/configure
index bc0f7e2..df439c9 100755
--- a/configure
+++ b/configure
@@ -155,7 +155,7 @@
EXESUF=""
prefix="/usr/local"
mandir="\${prefix}/share/man"
-qemu_datadir="\${prefix}/share/qemu"
+datadir="\${prefix}/share"
qemu_docdir="\${prefix}/share/doc/qemu"
bindir="\${prefix}/bin"
libdir="\${prefix}/lib"
@@ -521,7 +521,7 @@
fi
prefix="c:/Program Files/QEMU"
mandir="\${prefix}"
- qemu_datadir="\${prefix}"
+ datadir="\${prefix}"
qemu_docdir="\${prefix}"
bindir="\${prefix}"
sysconfdir="\${prefix}"
@@ -589,7 +589,7 @@
;;
--includedir=*) includedir="$optarg"
;;
- --datadir=*) qemu_datadir="$optarg"
+ --datadir=*) datadir="$optarg"
;;
--docdir=*) qemu_docdir="$optarg"
;;
@@ -1007,7 +1007,7 @@
echo " --smbd=SMBD use specified smbd [$smbd]"
echo " --static enable static build [$static]"
echo " --mandir=PATH install man pages in PATH"
-echo " --datadir=PATH install firmware in PATH"
+echo " --datadir=PATH install firmware in PATH/qemu"
echo " --docdir=PATH install documentation in PATH"
echo " --bindir=PATH install binaries in PATH"
echo " --sysconfdir=PATH install config in PATH/qemu"
@@ -2880,6 +2880,7 @@
fi
qemu_confdir=$sysconfdir$confsuffix
+qemu_datadir=$datadir$confsuffix
tools=
if test "$softmmu" = yes ; then