build-sys: don't build distcheck version with split /usr

diff --git a/Makefile.am b/Makefile.am
index dcce170d358149c29b7a5626c083752b17266f7d..5d987147b30732884221b80a4a7e63e0d20ae759 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2492,7 +2492,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \

-       --with-rootprefix=$$dc_install_base/$(prefix)
+        --with-rootprefix=$$dc_install_base \
+        --disable-split-usr

 
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
 
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/

diff --git a/configure.ac b/configure.ac
index 386008843a8177da64675a3c667565acaf92ce2f..76ca2923bc32ba5c6d88a1f16e31626ea7f22ec6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -655,5 +655,5 @@ AC_MSG_RESULT([
         D-Bus system dir:        ${with_dbussystemservicedir}
         D-Bus interfaces dir:    ${with_dbusinterfacedir}
         Split /usr:              ${enable_split_usr}
         D-Bus system dir:        ${with_dbussystemservicedir}
         D-Bus interfaces dir:    ${with_dbusinterfacedir}
         Split /usr:              ${enable_split_usr}

-        Build man pages:         ${have_manpages}
+        man pages:               ${have_manpages}

 ])
 ])