diff options
| -rw-r--r-- | remote/modules/systemd/systemd.build | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index a5f9ef3b..710c4ea6 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -36,7 +36,6 @@ build () { || perror "./configure util-linux failed." make || perror "util-linux make failed." make install || perror "util-linux make install failed." - cd - &> /dev/null # patching configure for Scientific Linux - cave - ugly hack! pinfo "Scientific Linux detected; patching systemd/configure..." @@ -45,35 +44,18 @@ build () { mv configure configure.orig mv configure.patched configure chmod +x configure - cd - &> /dev/null - - #build systemd for Scientific Linux - pinfo "Building systemd" - cd "${MODULE_DIR}/src/$REQUIRED_VERSION" - pinfo "calling configure" - ./configure --prefix=${MODULE_DIR}/build --exec-prefix=${MODULE_DIR}/build --datadir=${MODULE_DIR}/build \ - --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \ - --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \ - --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam \ - || perror "configure failed." - pinfo "calling make" - make || perror "make failed." - pinfo "calling make install" - DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed." - else - #build systemd - pinfo "Building systemd" - cd "${MODULE_DIR}/src/$REQUIRED_VERSION" - pinfo "calling configure" - ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \ - --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \ - --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam \ - || perror "configure failed." - pinfo "calling make" - make || perror "make failed." - pinfo "calling make install" - DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed." fi + + + #build systemd + pinfo "Building systemd" + cd "${MODULE_DIR}/src/$REQUIRED_VERSION" + pinfo "calling configure" + ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam|| perror "configure failed." + pinfo "calling make" + make || perror "make failed." + pinfo "calling make install" + DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed." cd - &> /dev/null # Delete unneeded services pinfo "Deleting unneeded services" |