aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2020-03-22 15:40:09 -0500
committerGitHub <noreply@github.com>2020-03-22 13:40:09 -0700
commitff7d6954aba0f6616c12a8cf304f5f38a6d0df12 (patch)
treebb7ad5c0f5ee6ea1a9d21675ffd59161f3e37b9a /configure
parent59a9277ac1e3f9aca630fb035d1dbacaa091e375 (diff)
downloadspike-ff7d6954aba0f6616c12a8cf304f5f38a6d0df12.zip
spike-ff7d6954aba0f6616c12a8cf304f5f38a6d0df12.tar.gz
spike-ff7d6954aba0f6616c12a8cf304f5f38a6d0df12.tar.bz2
Fix hard-coded path to DTC that breaks packaging (#428)
configure.ac included code which detects and inserted a full path to dtc. Unfortunately, when building with a packaging system, this path reflects the path under a staged building area. Also the inclusion of a full path breaks the use case where someone keeps two versions of dtc on their computer and sets their PATH to switch between them. spike will continue to use the one on their PATH when it was built rather than the intended one. Co-authored-by: Joel Sherrill <joel@rtems.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure16
1 files changed, 2 insertions, 14 deletions
diff --git a/configure b/configure
index c76f0e8..6b850a3 100755
--- a/configure
+++ b/configure
@@ -676,7 +676,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -761,7 +760,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1014,15 +1012,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1160,7 +1149,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1313,7 +1302,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -3630,7 +3618,7 @@ if test x"$DTC" == xno; then :
fi
cat >>confdefs.h <<_ACEOF
-#define DTC "$DTC"
+#define DTC "dtc"
_ACEOF