Consolidate configuration of all installation paths into configure.ac
The configuration of the installation paths for various components was scattered between the main configure.ac file and the various Makefile.am's. These components are: udev config file, hwdb, keymaps and force-release keymaps and the rules. This commit consolidates them all into one point in configure.ac and anticipates the inclusion of new AM_CPPFLAGS of the form -DHWDB_BIN=@udevhwdbdir@ as upstream has done, so it is easier to address issues like: https://github.com/gentoo/eudev/issues/17 Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
This commit is contained in:
Anthony G. Basile
parent
ef6fd93e79
commit
e5cc2b881f
85
configure.ac
85
configure.ac
|
|
@ -96,9 +96,65 @@ AC_CHECK_FUNCS(
|
|||
AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([*** POSIX librt not found])])
|
||||
AC_SEARCH_LIBS([sqrt], [m], [], [AC_MSG_ERROR([*** POSIX libm not found])])
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
# TODO: the old python checks are irrelevant, but we do need python and perl for tests
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Set paths here
|
||||
|
||||
AC_ARG_WITH(
|
||||
[rootprefix],
|
||||
[AS_HELP_STRING(
|
||||
[--with-rootprefix=DIR],
|
||||
[rootfs directory prefix for config files and kernel modules])],
|
||||
[],
|
||||
[with_rootprefix=${ac_default_prefix}]
|
||||
)
|
||||
|
||||
AC_ARG_WITH(
|
||||
[rootlibdir],
|
||||
[AS_HELP_STRING(
|
||||
[--with-rootlibdir=DIR],
|
||||
[Root directory for libraries necessary for boot])],
|
||||
[],
|
||||
[with_rootlibdir=${libdir}]
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE(
|
||||
[split-usr],
|
||||
[AS_HELP_STRING(
|
||||
[--enable-split-usr],
|
||||
[Assume that /bin, /sbin are not symlinks into /usr])],
|
||||
[],
|
||||
[AS_IF(
|
||||
[test "x${ac_default_prefix}" != "x${with_rootprefix}"],
|
||||
[enable_split_usr=yes],
|
||||
[enable_split_usr=no])]
|
||||
)
|
||||
|
||||
AS_IF(
|
||||
[test "x${enable_split_usr}" = "xyes"],
|
||||
[AC_DEFINE(HAVE_SPLIT_USR, 1, [Define if /bin, /sbin are not symlinks into /usr])]
|
||||
)
|
||||
|
||||
# Configured paths
|
||||
AC_SUBST([rootprefix], [$with_rootprefix])
|
||||
AC_SUBST([rootlibdir], [$with_rootlibdir])
|
||||
AC_SUBST([udevlibexecdir], [${with_rootlibdir}/udev])
|
||||
|
||||
# sysconfdir paths
|
||||
AC_SUBST([udevconfdir],[${sysconfdir}/udev])
|
||||
AC_SUBST([udevhwdbdir],[${sysconfdir}/hwdb.d])
|
||||
AC_SUBST([udevkeymapdir],[${sysconfdir}/keymaps])
|
||||
AC_SUBST([udevkeymapforcereldir],[${sysconfdir}/keymaps/force-release])
|
||||
|
||||
# libexecdir paths
|
||||
AC_SUBST([udevrulesdir],[${udevlibexecdir}/rules.d])
|
||||
|
||||
# pkgconfigdir paths
|
||||
AC_SUBST([sharepkgconfigdir],[${datadir}/pkgconfig])
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
have_introspection=no
|
||||
|
|
@ -225,35 +281,6 @@ AS_IF([test "x$enable_manpages" != xno], [
|
|||
])
|
||||
AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
AC_ARG_WITH([rootprefix],
|
||||
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
|
||||
[], [with_rootprefix=${ac_default_prefix}])
|
||||
|
||||
AC_ARG_WITH([rootlibdir],
|
||||
AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for libraries necessary for boot]),
|
||||
[],
|
||||
[with_rootlibdir=${libdir}])
|
||||
|
||||
AC_ARG_ENABLE([split-usr],
|
||||
AS_HELP_STRING([--enable-split-usr], [Assume that /bin, /sbin aren\'t symlinks into /usr]),
|
||||
[],
|
||||
[AS_IF([test "x${ac_default_prefix}" != "x${with_rootprefix}"], [
|
||||
enable_split_usr=yes
|
||||
], [
|
||||
enable_split_usr=no
|
||||
])])
|
||||
|
||||
AS_IF([test "x${enable_split_usr}" = "xyes"], [
|
||||
AC_DEFINE(HAVE_SPLIT_USR, 1, [Define if /bin, /sbin aren't symlinks into /usr])
|
||||
])
|
||||
|
||||
AC_SUBST([rootprefix], [$with_rootprefix])
|
||||
AC_SUBST([rootlibdir], [$with_rootlibdir])
|
||||
AC_SUBST([udevlibexecdir], [${with_rootlibdir}/udev])
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
LIBKMOD=
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
udevhwdbdir = $(udevlibexecdir)/hwdb.d
|
||||
udevhwdbdir = @udevhwdbdir@
|
||||
|
||||
dist_udevhwdb_DATA = \
|
||||
20-pci-vendor-product.hwdb \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release
|
||||
udevkeymapforcereldir = @udevkeymapforcereldir@
|
||||
|
||||
dist_udevkeymapforcerel_DATA = \
|
||||
dell-touchpad \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
udevkeymapdir = $(udevlibexecdir)/keymaps
|
||||
udevkeymapdir = @udevkeymapdir@
|
||||
|
||||
KEYMAPS = \
|
||||
acer \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
udevrulesdir = $(udevlibexecdir)/rules.d
|
||||
udevrulesdir = @udevrulesdir@
|
||||
|
||||
dist_udevrules_DATA = \
|
||||
42-usb-hid-pm.rules \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
udevhomedir = $(udevlibexecdir)
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I $(top_srcdir)/src/libudev \
|
||||
|
|
@ -31,7 +29,7 @@ BUILT_SOURCES = \
|
|||
dist_doc_DATA = \
|
||||
README.keymap.txt
|
||||
|
||||
dist_udevhome_SCRIPTS = \
|
||||
dist_udevlibexec_SCRIPTS = \
|
||||
findkeyboards \
|
||||
keyboard-force-release.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
|
||||
udevlibexec_PROGRAMS = \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
udevhomedir = $(udevlibexecdir)
|
||||
rootprefix = @rootprefix@
|
||||
udevlibexecdir = @udevlibexecdir@
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-include $(top_builddir)/config.h \
|
||||
|
|
@ -133,11 +132,11 @@ libudev_core_la_CPPFLAGS = \
|
|||
#
|
||||
# Extras
|
||||
#
|
||||
udevconfdir = $(sysconfdir)/udev
|
||||
udevconfdir = @udevconfdir@
|
||||
dist_udevconf_DATA = \
|
||||
udev.conf
|
||||
|
||||
sharepkgconfigdir = $(datadir)/pkgconfig
|
||||
sharepkgconfigdir = @sharepkgconfigdir@
|
||||
sharepkgconfig_DATA = \
|
||||
udev.pc
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
rootprefix=@rootprefix@
|
||||
udevlibexecdir=@udevlibexecdir@
|
||||
|
||||
udevlibexec_PROGRAMS = \
|
||||
|
|
|
|||
Loading…
Reference in New Issue