[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/14] configure: change meaning of --datadir to Aut
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 13/14] configure: change meaning of --datadir to Autoconf convention |
Date: |
Wed, 18 Apr 2012 16:55:49 -0300 |
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 <address@hidden>
---
configure | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index d995615..4c0bb2f 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"
@@ -2855,6 +2855,7 @@ if test "$mingw32" = "yes" ; then
fi
qemu_confdir=$sysconfdir$confsuffix
+qemu_datadir=$datadir$confsuffix
tools=
if test "$softmmu" = yes ; then
--
1.7.3.2
- [Qemu-devel] [PATCH v5 00/14] configure: --with-confsuffix option, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 01/14] configure: rename $datadir to $qemu_datadir, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 08/14] config-host.mak: rename docdir to qemu_docdir, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 06/14] config-host.mak: rename confdir to qemu_confdir, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 03/14] configure: rename $confdir to $qemu_confdir, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 12/14] create_config: simplify prefix=* block, remove CONFIG_QEMU_PREFIX, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 11/14] create_config: remove *dir block, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 04/14] create_config: separate section for qemu_*dir variables (v2), Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 13/14] configure: change meaning of --datadir to Autoconf convention,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 10/14] config-host.mak: reorder variables a bit, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 07/14] Makefile: use $(qemu_confdir) instead of $(sysconfdir)/qemu, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 05/14] config-host.mak: rename datadir to qemu_datadir, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 14/14] configure: add --with-confsuffix option, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 02/14] configure: rename $docdir to $qemu_docdir, Eduardo Habkost, 2012/04/18
- [Qemu-devel] [PATCH 09/14] config-host.mak: remove CONFIG_QEMU_SHAREDIR, Eduardo Habkost, 2012/04/18
- Re: [Qemu-devel] [PATCH v5 00/14] configure: --with-confsuffix option, Anthony Liguori, 2012/04/24