[X2Go-Commits] [x2goserver] 01/01: debian/rules: don't fail if we don't have the systemd addon.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit edeaf3372838e692a4d3fad63fa07f735224e17d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Mar 1 12:38:48 2017 +0100

    debian/rules: don't fail if we don't have the systemd addon.
    
    Systems that don't have that will likely not use systemd in the first
    place.
    
    Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog |    2 ++
 debian/rules     |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fdac537..c50fd16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -256,6 +256,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
     - Add BD on dh-systemd. We'll need it for systemd integration.
   * debian/rules:
     - Call the systemd addon to process and install the systemd service file.
+    - Don't fail if we don't have the systemd addon. Systems that don't have
+      that will likely not use systemd in the first place.
 
   [ Martti Pitkänen ]
   * debian/po:
diff --git a/debian/rules b/debian/rules
index a75a2ba..660ed23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export NXLIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/nx"
 
 %:
-	PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh ${@} --with=systemd
+	PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh ${@} --with=systemd || PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh ${@}
 
 override_dh_auto_build:
 	PREFIX=/usr NXLIBDIR=$(NXLIBDIR) PERL_INSTALLDIRS=vendor dh_auto_build

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git