From 13d68fab40051e82a40c01e968ca6167ecb92dbd Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 5 Feb 2013 16:19:53 +0000 Subject: tools+stubdom: install under /usr/local by default. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that the hotplug scripts have been fixed to remove hardcoded paths lets try this again. From 26470:acaf29203cf9: This is the defacto (or FHS mandated?) standard location for software built from source, in order to avoid clashing with packaged software which is installed under /usr/bin etc. I think there is benefit in having Xen's install behave more like the majority of other OSS software out there. The major downside here is in the transition from 4.2 to 4.3 where people who have built from source will innevitably discover breakage because 4.3 no longer overwrites stuff in /usr like it used to so they pickup old stale bits from /usr instead of new stuff from /usr/local. Packages will use ./configure --prefix=/usr or whatever helper macro their package manager gives them. I have confirmed that doing this results in the same list of installed files as before this patch was applied. The hypervisor remains in /boot/ and there is no intention to move it. Signed-off-by: Ian Campbell Acked-by: Roger Pau Monné --- configure | 2 -- configure.ac | 1 - docs/configure | 2 -- docs/configure.ac | 1 - stubdom/configure | 2 -- stubdom/configure.ac | 1 - tools/configure | 2 -- tools/configure.ac | 1 - 8 files changed, 12 deletions(-) diff --git a/configure b/configure index 06c0e99382..d15b53924c 100755 --- a/configure +++ b/configure @@ -557,7 +557,6 @@ PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' ac_unique_file="./xen/common/kernel.c" -ac_default_prefix=/usr enable_option_checking=no ac_subst_vars='LTLIBOBJS LIBOBJS @@ -1684,7 +1683,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_files="$ac_config_files ./config/Toplevel.mk" - ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then diff --git a/configure.ac b/configure.ac index 83342f762f..ce06dad102 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,6 @@ AC_INIT([Xen Hypervisor], m4_esyscmd([./version.sh ./xen/Makefile]), [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) AC_CONFIG_SRCDIR([./xen/common/kernel.c]) AC_CONFIG_FILES([./config/Toplevel.mk]) -AC_PREFIX_DEFAULT([/usr]) AC_CANONICAL_HOST diff --git a/docs/configure b/docs/configure index be4934dd21..d623d19446 100755 --- a/docs/configure +++ b/docs/configure @@ -557,7 +557,6 @@ PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' ac_unique_file="misc/xen-command-line.markdown" -ac_default_prefix=/usr ac_subst_vars='LTLIBOBJS LIBOBJS MARKDOWN @@ -1664,7 +1663,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_files="$ac_config_files ../config/Docs.mk" - ac_aux_dir= for ac_dir in ../ "$srcdir"/../; do if test -f "$ac_dir/install-sh"; then diff --git a/docs/configure.ac b/docs/configure.ac index 5c3f5e8b60..ea0552e43d 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -6,7 +6,6 @@ AC_INIT([Xen Hypervisor Documentation], m4_esyscmd([../version.sh ../xen/Makefil [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) AC_CONFIG_SRCDIR([misc/xen-command-line.markdown]) AC_CONFIG_FILES([../config/Docs.mk]) -AC_PREFIX_DEFAULT([/usr]) AC_CONFIG_AUX_DIR([../]) # M4 Macro includes diff --git a/stubdom/configure b/stubdom/configure index ab9219abf2..51ca6766f0 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -557,7 +557,6 @@ PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' ac_unique_file="../extras/mini-os/kernel.c" -ac_default_prefix=/usr ac_subst_vars='LTLIBOBJS LIBOBJS STUBDOM_INSTALL @@ -1792,7 +1791,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_files="$ac_config_files ../config/Stubdom.mk" - ac_aux_dir= for ac_dir in ../ "$srcdir"/../; do if test -f "$ac_dir/install-sh"; then diff --git a/stubdom/configure.ac b/stubdom/configure.ac index 2b7b2751d8..de29fb5706 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -6,7 +6,6 @@ AC_INIT([Xen Hypervisor Stub Domains], m4_esyscmd([../version.sh ../xen/Makefile [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) AC_CONFIG_SRCDIR([../extras/mini-os/kernel.c]) AC_CONFIG_FILES([../config/Stubdom.mk]) -AC_PREFIX_DEFAULT([/usr]) AC_CONFIG_AUX_DIR([../]) # M4 Macro includes diff --git a/tools/configure b/tools/configure index 4cd46e0274..7b8cef8e2f 100755 --- a/tools/configure +++ b/tools/configure @@ -558,7 +558,6 @@ PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' ac_unique_file="libxl/libxl.c" -ac_default_prefix=/usr # Factoring default headers for most tests. ac_includes_default="\ #include @@ -2153,7 +2152,6 @@ ac_config_files="$ac_config_files ../config/Tools.mk" ac_config_headers="$ac_config_headers config.h" - ac_aux_dir= for ac_dir in ../ "$srcdir"/../; do if test -f "$ac_dir/install-sh"; then diff --git a/tools/configure.ac b/tools/configure.ac index c5eb2b1893..4f5e688ce2 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -7,7 +7,6 @@ AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh ../xen/Makefile]), AC_CONFIG_SRCDIR([libxl/libxl.c]) AC_CONFIG_FILES([../config/Tools.mk]) AC_CONFIG_HEADERS([config.h]) -AC_PREFIX_DEFAULT([/usr]) AC_CONFIG_AUX_DIR([../]) # Check if CFLAGS, LDFLAGS, LIBS, CPPFLAGS or CPP is set and print a warning -- cgit v1.2.3