diff options
| author | steelman <stlman@poczta.fm> | 2017-03-15 00:16:47 +0100 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-04-17 16:23:29 -0400 |
| commit | 00c54bbbfe0cab442cd5fbaca199d5cafb0f01ad (patch) | |
| tree | fa0a8dc54866088b46827c0e3550845274b4abc3 | |
| parent | d60c527009133a1ed3d69c14b8c837c790e78d10 (diff) | |
build-sys: make RPM macros installation path configurable (#5564)systemd/v233-3
--with-rpmmacrosdir=no disables installation of the macros.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 2a5610740e..3a1d769c5d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,7 +59,7 @@ polkitrulesdir=$(datadir)/polkit-1/rules.d polkitpkladir=$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d bashcompletiondir=@bashcompletiondir@ zshcompletiondir=@zshcompletiondir@ -rpmmacrosdir=$(prefix)/lib/rpm/macros.d +rpmmacrosdir=@rpmmacrosdir@ sysvinitdir=$(SYSTEM_SYSVINIT_PATH) sysvrcnddir=$(SYSTEM_SYSVRCND_PATH) varlogdir=$(localstatedir)/log @@ -178,6 +178,7 @@ CLEANFILES = $(BUILT_SOURCES) \ $(pkgconfiglib_DATA) \ $(nodist_bashcompletion_data) \ $(nodist_zshcompletion_data) \ + $(nodist_rpmmacros_DATA) \ $(in_files:.in=) $(in_in_files:.in.in=) \ $(m4_files:.m4=) @@ -1498,8 +1499,10 @@ polkitpolicy_in_in_files += \ pkgconfigdata_DATA += \ src/core/systemd.pc +if ENABLE_RPM_MACROS nodist_rpmmacros_DATA = \ src/core/macros.systemd +endif BUILT_SOURCES += \ src/core/triggers.systemd @@ -6567,6 +6570,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ + --with-rpmmacrosdir=$$dc_install_base/$(rpmmacrosdir) \ --with-rootprefix=$$dc_install_base \ --enable-compat-libs diff --git a/configure.ac b/configure.ac index 3835413ad5..1b355dd660 100644 --- a/configure.ac +++ b/configure.ac @@ -1571,6 +1571,12 @@ AC_ARG_WITH([pamconfdir], AM_CONDITIONAL(ENABLE_PAM_CONFIG, [test "$with_pamconfdir" != "no"]) AX_NORMALIZE_PATH([with_pamconfdir]) +AC_ARG_WITH([rpmmacrosdir], + AS_HELP_STRING([--with-rpmmacrosdir=DIR], [directory to store macros for RPM]), + [], [with_rpmmacrosdir=\${prefix}/lib/rpm/macros.d]) +AM_CONDITIONAL(ENABLE_RPM_MACROS, [test "$with_rpmmacrosdir" != "no"]) +AX_NORMALIZE_PATH([with_rpmmacrosdir]) + AC_ARG_ENABLE([split-usr], AS_HELP_STRING([--enable-split-usr], [assume that /bin, /sbin aren't symlinks into /usr]), [], @@ -1641,6 +1647,7 @@ AC_SUBST([bashcompletiondir], [$with_bashcompletiondir]) AC_SUBST([zshcompletiondir], [$with_zshcompletiondir]) AC_SUBST([pamlibdir], [$with_pamlibdir]) AC_SUBST([pamconfdir], [$with_pamconfdir]) +AC_SUBST([rpmmacrosdir], [$with_rpmmacrosdir]) AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) @@ -1740,6 +1747,7 @@ AC_MSG_RESULT([ build Python: ${PYTHON} PAM modules dir: ${with_pamlibdir} PAM configuration dir: ${with_pamconfdir} + RPM macros dir: ${with_rpmmacrosdir} D-Bus policy dir: ${with_dbuspolicydir} D-Bus session dir: ${with_dbussessionservicedir} D-Bus system dir: ${with_dbussystemservicedir} |