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 --- stubdom/configure | 2 ++ stubdom/configure.ac | 1 + 2 files changed, 3 insertions(+) (limited to 'stubdom') 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 -- cgit v1.2.3