From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 16 Mar 2012 00:44:16 +0000 (+0100)
Subject: build-sys: don't build distcheck version with split /usr
X-Git-Tag: v44~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5ee9f21e86bb6a06d3eb956546f85338e81395e6;ds=sidebyside

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

diff --git a/Makefile.am b/Makefile.am
index dcce170d3..5d987147b 100644
--- 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-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/
diff --git a/configure.ac b/configure.ac
index 386008843..76ca2923b 100644
--- 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}
-        Build man pages:         ${have_manpages}
+        man pages:               ${have_manpages}
 ])