aboutsummaryrefslogtreecommitdiffstats
path: root/stubdom
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2013-01-28 16:48:19 +0000
committerIan Campbell <ian.campbell@citrix.com>2013-01-28 16:48:19 +0000
commit748e38f4719ea739f39b9529664e2221d6f8a394 (patch)
treecf7752fdcf59e0f10a145240bf7af87e88ee76f3 /stubdom
parentdea5493db4fffd1ab40666846fdbc9c0c34cb922 (diff)
downloadxen-748e38f4719ea739f39b9529664e2221d6f8a394.tar.gz
xen-748e38f4719ea739f39b9529664e2221d6f8a394.tar.bz2
xen-748e38f4719ea739f39b9529664e2221d6f8a394.zip
tools: revert to installing in /usr
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 <ian.campbell@citrix.com> Acked-by: Roger Pau Monné <roger.pau@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'stubdom')
-rwxr-xr-xstubdom/configure2
-rw-r--r--stubdom/configure.ac1
2 files changed, 3 insertions, 0 deletions
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