summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-03-16 01:44:16 +0100
committerLennart Poettering <lennart@poettering.net>2012-03-16 01:44:16 +0100
commit5ee9f21e86bb6a06d3eb956546f85338e81395e6 (patch)
treed3dc03df6aff2198d3397b22220833c1909c5355
parent38cacf5acd082b6426e4778d242dc24bf10607ce (diff)
build-sys: don't build distcheck version with split /usr
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac2
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index dcce170d35..5d987147b3 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 386008843a..76ca2923bc 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}
])