diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-01-28 16:48:19 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-01-28 16:48:19 +0000 |
| commit | 748e38f4719ea739f39b9529664e2221d6f8a394 (patch) | |
| tree | cf7752fdcf59e0f10a145240bf7af87e88ee76f3 /tools | |
| parent | dea5493db4fffd1ab40666846fdbc9c0c34cb922 (diff) | |
| download | xen-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 'tools')
| -rwxr-xr-x | tools/configure | 2 | ||||
| -rw-r--r-- | tools/configure.ac | 1 |
2 files changed, 3 insertions, 0 deletions
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 <stdio.h> @@ -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 |