From 528ae5b85079ce5744c7d682b11045eee7e0fb70 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 18 Apr 2012 16:55:49 -0300 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori --- configure | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure b/configure index bc0f7e2b43..df439c92bd 100755 --- a/configure +++ b/configure @@ -155,7 +155,7 @@ mingw32="no" 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 @@ EOF fi prefix="c:/Program Files/QEMU" mandir="\${prefix}" - qemu_datadir="\${prefix}" + datadir="\${prefix}" qemu_docdir="\${prefix}" bindir="\${prefix}" sysconfdir="\${prefix}" @@ -589,7 +589,7 @@ for opt do ;; --includedir=*) includedir="$optarg" ;; - --datadir=*) qemu_datadir="$optarg" + --datadir=*) datadir="$optarg" ;; --docdir=*) qemu_docdir="$optarg" ;; @@ -1007,7 +1007,7 @@ echo " --python=PYTHON use specified python [$python]" 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 @@ if test "$mingw32" = "yes" ; then fi qemu_confdir=$sysconfdir$confsuffix +qemu_datadir=$datadir$confsuffix tools= if test "$softmmu" = yes ; then