diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2020-03-22 15:40:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-22 13:40:09 -0700 |
commit | ff7d6954aba0f6616c12a8cf304f5f38a6d0df12 (patch) | |
tree | bb7ad5c0f5ee6ea1a9d21675ffd59161f3e37b9a | |
parent | 59a9277ac1e3f9aca630fb035d1dbacaa091e375 (diff) | |
download | spike-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>
-rwxr-xr-x | configure | 16 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 15 deletions
@@ -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 diff --git a/configure.ac b/configure.ac index 49e2e0d..a414bb6 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ AC_CHECK_TOOL([AR],[ar]) AC_CHECK_TOOL([RANLIB],[ranlib]) AC_PATH_PROG([DTC],[dtc],[no]) AS_IF([test x"$DTC" == xno],AC_MSG_ERROR([device-tree-compiler not found])) -AC_DEFINE_UNQUOTED(DTC, ["$DTC"], [Path to the device-tree-compiler]) +AC_DEFINE_UNQUOTED(DTC, ["dtc"], [Executable name of device-tree-compiler]) AC_C_BIGENDIAN |