From 748e38f4719ea739f39b9529664e2221d6f8a394 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 28 Jan 2013 16:48:19 +0000 Subject: tools: revert to installing in /usr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 26470:acaf29203cf9 missed a bunch of hardcoded paths, e.g. in the initscripts. I think at this juncture it is appropriate to revert this change and try again after some more testing. Signed-off-by: Ian Campbell Acked-by: Roger Pau Monné Committed-by: Ian Campbell --- 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 insertions(+) diff --git a/configure b/configure index cbc38ba19d..c2ec87d381 100755 --- a/configure +++ b/configure @@ -557,6 +557,7 @@ 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 @@ -1685,6 +1686,7 @@ 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 b17e671659..df1d5da17a 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,7 @@ 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]) m4_include([m4/features.m4]) m4_include([m4/subsystem.m4]) diff --git a/docs/configure b/docs/configure index d623d19446..be4934dd21 100755 --- a/docs/configure +++ b/docs/configure @@ -557,6 +557,7 @@ 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 @@ -1663,6 +1664,7 @@ 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 ea0552e43d..5c3f5e8b60 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -6,6 +6,7 @@ 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 51ca6766f0..ab9219abf2 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -557,6 +557,7 @@ 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 @@ -1791,6 +1792,7 @@ 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 de29fb5706..2b7b2751d8 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -6,6 +6,7 @@ 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 1f33858d94..898dd17809 100755 --- a/tools/configure +++ b/tools/configure @@ -558,6 +558,7 @@ 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 @@ -2144,6 +2145,7 @@ 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 4411f63a6c..2bd71b6adc 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -7,6 +7,7 @@ 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