mirror of
https://github.com/ntop/n2n.git
synced 2024-09-19 00:21:11 +02:00
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:
parent
15fe4f786f
commit
4b4311e2fa
8
Makefile
8
Makefile
|
@ -66,13 +66,9 @@ INSTALL_PROG=$(INSTALL) -m755
|
||||||
INSTALL_DOC=$(INSTALL) -m644
|
INSTALL_DOC=$(INSTALL) -m644
|
||||||
|
|
||||||
# DESTDIR set in debian make system
|
# DESTDIR set in debian make system
|
||||||
PREFIX?=$(DESTDIR)/usr
|
PREFIX?=$(DESTDIR)/$(CONFIG_PREFIX)
|
||||||
ifeq ($(CONFIG_TARGET),darwin)
|
|
||||||
SBINDIR=$(PREFIX)/local/sbin
|
|
||||||
else
|
|
||||||
SBINDIR=$(PREFIX)/sbin
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
SBINDIR=$(PREFIX)/sbin
|
||||||
MANDIR?=$(PREFIX)/share/man
|
MANDIR?=$(PREFIX)/share/man
|
||||||
MAN1DIR=$(MANDIR)/man1
|
MAN1DIR=$(MANDIR)/man1
|
||||||
MAN7DIR=$(MANDIR)/man7
|
MAN7DIR=$(MANDIR)/man7
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
CONFIG_HOST=@host@
|
CONFIG_HOST=@host@
|
||||||
|
CONFIG_PREFIX=@prefix@
|
||||||
|
|
||||||
PACKAGE_VERSION=@PACKAGE_VERSION@
|
PACKAGE_VERSION=@PACKAGE_VERSION@
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
AR=@AR@
|
AR=@AR@
|
||||||
|
|
13
configure.ac
13
configure.ac
|
@ -13,13 +13,24 @@ AC_CHECK_TOOL([AR], [ar], [false])
|
||||||
AC_CHECK_TOOL([WINDRES], [windres], [windres])
|
AC_CHECK_TOOL([WINDRES], [windres], [windres])
|
||||||
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
*-solaris*)
|
solaris*)
|
||||||
# Was in Makefile with the test `uname` -eq "SunOS"
|
# Was in Makefile with the test `uname` -eq "SunOS"
|
||||||
# and comment "For OpenSolaris (Solaris too?)"
|
# and comment "For OpenSolaris (Solaris too?)"
|
||||||
LIBS="-lsocket -lnsl $LIBS"
|
LIBS="-lsocket -lnsl $LIBS"
|
||||||
;;
|
;;
|
||||||
esac
|
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
|
# TODO: ideally, should use AC_ARG_ENABLE
|
||||||
AC_ARG_WITH([edgex],
|
AC_ARG_WITH([edgex],
|
||||||
AS_HELP_STRING([--with-edgex], [Build for Ubiquity-X]),
|
AS_HELP_STRING([--with-edgex], [Build for Ubiquity-X]),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user