tools+stubdom: install under /usr/local by default.

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 <ian.campbell@citrix.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Matt Wilson <msw@amazon.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/configure b/configure
index 2c1f5bce3984aa92fc34f97bff66d015f564e662..cbc38ba19d5be3e4ce080ab37000413450309a55 100755 (executable)
--- 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
@@ -1669,7 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 ac_config_files="$ac_config_files ./config/Toplevel.mk"
 
 

diff --git a/configure.ac b/configure.ac
index fcbc4ae5742a62617ec27e6088ee4c5591c53f64..b17e671659f6dd391aea73456dd9233c3b95256d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,6 @@ AC_PREREQ([2.67])
 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_PREFIX_DEFAULT([/usr])
 AC_CONFIG_FILES([./config/Toplevel.mk])
 
 m4_include([m4/features.m4])

diff --git a/stubdom/configure b/stubdom/configure
index ab9219abf2b7a46fe0ec4cfff45fab1026381c5c..51ca6766f016f269fb4c73e44b430da0827d3047 100755 (executable)
--- 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 2b7b2751d8f5d3545a2659e486f109781ff2bcbe..de29fb570629a872a2be775ee4a6be6932f1c1c7 100644 (file)
--- 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 898dd1780950af6088a1a96488bdc9590fb19d00..1f33858d947068805ef7142c0e6f23a46189fda2 100755 (executable)
--- 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 <stdio.h>
@@ -2145,7 +2144,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 2bd71b6adcb984a0ace4a025be2d45a734d0ec24..4411f63a6c5ee109602ad455c4a704c194da7ca0 100644 (file)
--- 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