X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;fp=debian%2Frules;h=366bdceace824fd60e1d395205543e3c781e6862;hb=915594195c5ce096a49dba13437e79340c3f37f3;hp=4cbc3d3cecfbc0ca789dce3f5ce9b6bb6bba353a;hpb=d74d86840056e83cd0138a261ab7b6040a43bfb4;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index 4cbc3d3..366bdce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,10 @@ KSRC?=$(LINUX_OBJ)
 KSRC_TREE?=$(LINUX)
 EXTRA_OPTIONS?=$(IB_OPTIONS)
 
+ifneq ($(SYSTEMD_OPTIONS),)
+	EXTRA_OPTIONS += $(SYSTEMD_OPTIONS)
+endif
+
 # Packages provided for both client and server builds
 IOKIT_PKG=lustre-iokit
 TESTS_PKG=lustre-tests
@@ -164,8 +168,12 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "server"; then \
 		export EXTRAFLAGS="--enable-server"; \
 		if echo "$${DEB_BUILD_PROFILES}" | grep -q "systemd"; then \
-			cp debian/lustre-server-utils.install.in \
-				debian/lustre-server-utils.install; \
+			systemd_dir=$$(echo $${SYSTEMD_OPTIONS} | \
+				       sed -e "s/--with-systemdsystemunitdir=\///g" \
+					   -e "s/\//\\\\\//g"); \
+			sed "s/lib\/systemd\/system/$${systemd_dir}/g" \
+				debian/lustre-server-utils.install.in \
+				> debian/lustre-server-utils.install; \
 		else \
 			sed /systemd/d debian/lustre-server-utils.install.in \
 				> debian/lustre-server-utils.install; \
@@ -173,8 +181,12 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 	else \
 		export EXTRAFLAGS="--disable-server"; \
 		if echo "$${DEB_BUILD_PROFILES}" | grep -q "systemd"; then \
-			cp debian/lustre-client-utils.install.in \
-				debian/lustre-client-utils.install; \
+			systemd_dir=$$(echo $${SYSTEMD_OPTIONS} | \
+				       sed -e "s/--with-systemdsystemunitdir=\///g" \
+					   -e "s/\//\\\\\//g"); \
+			sed "s/lib\/systemd\/system/$${systemd_dir}/g" \
+				debian/lustre-client-utils.install.in \
+				> debian/lustre-client-utils.install; \
 		else \
 			sed /systemd/d debian/lustre-client-utils.install.in \
 				> debian/lustre-client-utils.install; \