deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compatibility with OpenBSD and macOS

Browse Source 
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>
This commit is contained in:
Alexander Amelkin 2020-07-01 00:25:56 +03:00 committed by Alexander Amelkin
parent 1f92c9ee23
commit 2158e6ea49
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -62,7 +62,7 @@ enterprise-numbers:
install-pen-database: enterprise-numbers install-pen-database: enterprise-numbers
mkdir -m 755 -p $(DESTDIR)$(IANADIR) mkdir -m 755 -p $(DESTDIR)$(IANADIR)
$(INSTALL_DATA) $< -t $(DESTDIR)$(IANADIR)/ $(INSTALL_DATA) $< $(DESTDIR)$(IANADIR)/
uninstall-pen-database: uninstall-pen-database:
-rm -rf $(DESTDIR)$(IANADIR)/enterprise-numbers -rm -rf $(DESTDIR)$(IANADIR)/enterprise-numbers

11
configure.ac
View File

@ -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)]) 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 if test "x${IANADIR}" = "x"; then
echo Set IANA PEN dictionary search path to ${datarootdir}/misc IANADIR=`eval echo "${datarootdir}/misc"`
IANADIR="${datarootdir}/misc" echo Set IANA PEN dictionary search path to ${IANADIR}
fi fi
if test "x${IANAUSERDIR}" = "x"; then if test "x${IANAUSERDIR}" = "x"; then
@ -748,10 +748,9 @@ AC_CONFIG_FILES([Makefile
src/plugins/usb/Makefile src/plugins/usb/Makefile
src/plugins/lipmi/Makefile src/plugins/lipmi/Makefile
src/plugins/serial/Makefile src/plugins/serial/Makefile
src/plugins/dummy/Makefile]) src/plugins/dummy/Makefile
doc/ipmitool.1
AC_CONFIG_FILES([doc/ipmitool.1], [${SED} -i -e "s%\${prefix}%$prefix%" doc/ipmitool.1]) doc/ipmievd.8])
AC_CONFIG_FILES([doc/ipmievd.8], [${SED} -i -e "s%\${prefix}%$prefix%" doc/ipmievd.8])
AC_OUTPUT AC_OUTPUT