Move the macos default install path config.

There is a minor change - after this, the macos man pages are also
installed into the /usr/local PREFIX.  This seems like the correct
location to me.

Longer term, the usual autotools process of installing everything into
/usr/local should be used.  Files installed in /usr should be done by
a package management tool, so this default makes sense to use.
This commit is contained in:
Hamish Coleman 2023-07-02 15:49:51 +01:00
parent 15fe4f786f
commit 4b4311e2fa
3 changed files with 16 additions and 7 deletions

View File

@ -66,13 +66,9 @@ INSTALL_PROG=$(INSTALL) -m755
INSTALL_DOC=$(INSTALL) -m644
# DESTDIR set in debian make system
PREFIX?=$(DESTDIR)/usr
ifeq ($(CONFIG_TARGET),darwin)
SBINDIR=$(PREFIX)/local/sbin
else
SBINDIR=$(PREFIX)/sbin
endif
PREFIX?=$(DESTDIR)/$(CONFIG_PREFIX)
SBINDIR=$(PREFIX)/sbin
MANDIR?=$(PREFIX)/share/man
MAN1DIR=$(MANDIR)/man1
MAN7DIR=$(MANDIR)/man7

View File

@ -2,6 +2,8 @@
# @configure_input@
CONFIG_HOST=@host@
CONFIG_PREFIX=@prefix@
PACKAGE_VERSION=@PACKAGE_VERSION@
CC=@CC@
AR=@AR@

View File

@ -13,13 +13,24 @@ AC_CHECK_TOOL([AR], [ar], [false])
AC_CHECK_TOOL([WINDRES], [windres], [windres])
case "$host_os" in
*-solaris*)
solaris*)
# Was in Makefile with the test `uname` -eq "SunOS"
# and comment "For OpenSolaris (Solaris too?)"
LIBS="-lsocket -lnsl $LIBS"
;;
esac
# This replicates the old config logic from the Makefile.
# TODO: remove all this and just use the autotools default prefix
# (which is "/usr/local")
case "$host_os" in
darwin*)
;;
*)
AC_PREFIX_DEFAULT(/usr)
;;
esac
# TODO: ideally, should use AC_ARG_ENABLE
AC_ARG_WITH([edgex],
AS_HELP_STRING([--with-edgex], [Build for Ubiquity-X]),