diff options
| author | Alexander Amelkin <alexander@amelkin.msk.ru> | 2020-07-01 00:25:56 +0300 |
|---|---|---|
| committer | Alexander Amelkin <mocbuhtig@amelkin.msk.ru> | 2020-07-04 00:26:38 +0300 |
| commit | 2158e6ea494a2a7f1f0e30ef3705a9a38e740d4b (patch) | |
| tree | 911bf2d041758b2accfc6764bf19ff8f3cfbdf50 | |
| parent | 1f92c9ee233fda6b7b20bcbd727adf89e53d2326 (diff) | |
| download | ipmitool-2158e6ea494a2a7f1f0e30ef3705a9a38e740d4b.tar.gz | |
Fix compatibility with OpenBSD and macOS
Neither of these systems have the `-t` option for `install`.
For Linux the option is not necessary and is only needed
if the target directory is specified before the source file(s).
Also, macOS produces strange files with -e suffix for man
pages when they are processed with sed using AC_CONFIG_FILES().
Move prefix expansion to another point in code to avoid these
unneeded intermediate files produced by configure.
Resolves: ipmitool/ipmitool#206
Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 00335d0..2d19374 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,7 +62,7 @@ enterprise-numbers: install-pen-database: enterprise-numbers mkdir -m 755 -p $(DESTDIR)$(IANADIR) - $(INSTALL_DATA) $< -t $(DESTDIR)$(IANADIR)/ + $(INSTALL_DATA) $< $(DESTDIR)$(IANADIR)/ uninstall-pen-database: -rm -rf $(DESTDIR)$(IANADIR)/enterprise-numbers diff --git a/configure.ac b/configure.ac index 913b19e..94018d3 100644 --- a/configure.ac +++ b/configure.ac @@ -702,8 +702,8 @@ AC_ARG_VAR(IANADIR, [Configure the path to IANA PEN dictionary (default=DATAROOT AC_ARG_VAR(IANAUSERDIR, [Configure the path to IANA PEN dictionary wihtin the user's HOME directory (default=.local/usr/share/misc)]) if test "x${IANADIR}" = "x"; then - echo Set IANA PEN dictionary search path to ${datarootdir}/misc - IANADIR="${datarootdir}/misc" + IANADIR=`eval echo "${datarootdir}/misc"` + echo Set IANA PEN dictionary search path to ${IANADIR} fi if test "x${IANAUSERDIR}" = "x"; then @@ -748,10 +748,9 @@ AC_CONFIG_FILES([Makefile src/plugins/usb/Makefile src/plugins/lipmi/Makefile src/plugins/serial/Makefile - src/plugins/dummy/Makefile]) - -AC_CONFIG_FILES([doc/ipmitool.1], [${SED} -i -e "s%\${prefix}%$prefix%" doc/ipmitool.1]) -AC_CONFIG_FILES([doc/ipmievd.8], [${SED} -i -e "s%\${prefix}%$prefix%" doc/ipmievd.8]) + src/plugins/dummy/Makefile + doc/ipmitool.1 + doc/ipmievd.8]) AC_OUTPUT |