From e40ae9d127bcecd32046eecd775d343ace882a14 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 6 Aug 2013 15:35:39 +0200
Subject: [systemd] .build: Experimental: Special cases for Scientific Linux:
 systemd configure options

---
 remote/modules/systemd/systemd.build | 40 ++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 11 deletions(-)

(limited to 'remote/modules/systemd/systemd.build')

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 710c4ea6..a5f9ef3b 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -36,6 +36,7 @@ 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..."
@@ -44,18 +45,35 @@ build () {
 		mv configure configure.orig
 		mv configure.patched configure
 		chmod +x configure
-	fi
-
+		cd - &> /dev/null
 
-	#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."
+		#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
 	cd - &> /dev/null
 	# Delete unneeded services
 	pinfo "Deleting unneeded services"
-- 
cgit v1.2.3-55-g7522