diff options
| author | Tom Gundersen <teg@jklm.no> | 2012-11-20 18:19:44 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2012-11-20 19:35:27 +0100 |
| commit | 1d0b59f932d96c108ad5e921213723a48e6b47b8 (patch) | |
| tree | 32f6a1805c43019e6e5546cc2f0ba98354bb0f3c | |
| parent | e9fd44b728ff1fc0d1f24fccb87a767f6865df27 (diff) | |
build-sys: fix sysvcompat handling in distcheck
Distcheck would fail due to sysvinit dir being set,
but not sysvrcnd dir:
# ./configure --enable-gtk-doc --with-sysvrcd-path=/etc/rc.d
# --with-sysvinit-path=/etc/rc.d
# make distcheck
...
configure: error: *** You need both --with-sysvinit-path=PATH and
--with-sysvrcd-path=PATH to enable SysV compatibility support, or both
empty to disable it.
make: *** [distcheck] Error 1
This also allows sysvcompat support to be disabled from distcheck.
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d08eea2e5..11eaf863f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,6 +62,7 @@ polkitpolicydir=$(datadir)/polkit-1/actions bashcompletiondir=$(sysconfdir)/bash_completion.d rpmmacrosdir=$(sysconfdir)/rpm sysvinitdir=$(SYSTEM_SYSVINIT_PATH) +sysvrcddir=$(SYSTEM_SYSVRCND_PATH) varlogdir=$(localstatedir)/log systemdstatedir=$(localstatedir)/lib/systemd catalogstatedir=$(systemdstatedir)/catalog @@ -4087,7 +4088,6 @@ clean-local: rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt DISTCHECK_CONFIGURE_FLAGS = \ - --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \ --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \ @@ -4096,6 +4096,13 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-rootprefix=$$dc_install_base \ --disable-split-usr + +if HAVE_SYSV_COMPAT +DISTCHECK_CONFIGURE_FLAGS += \ + --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \ + --with-sysvrcnd-path=$$dc_install_base/$(sysvrcddir) +endif + if ENABLE_GTK_DOC DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc |