[X2Go-Commits] [x2goserver] 01/06: x2goserver-common/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/.

[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 d943b7c00e330a94c5529d3fff12f57ed952aae2
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 21 22:00:00 2018 +0100

    x2goserver-common/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/.
    
    File should not be modified by users.
---
 debian/changelog           | 2 ++
 x2goserver-common/Makefile | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd25a26..c883df4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
     - x2goserver-x2goagent/Makefile: it's $(NXLIBDIR), not $(NX_LIBDIR).
     - x2goserver-x2goagent/Makefile: add missing bin component in symlink
       target for ${PREFIX}/bin/x2goagent.
+    - x2goserver-common/Makefile: stage tmpfiles.d config file into
+      ${PREFIX}/lib/. File should not be modified by users.
   * debian/{control,compat}:
     + Bump DH compat level to 9.
   * debian/:
diff --git a/x2goserver-common/Makefile b/x2goserver-common/Makefile
index 559b1bc..fe2cb99 100755
--- a/x2goserver-common/Makefile
+++ b/x2goserver-common/Makefile
@@ -64,8 +64,8 @@ install_config:
 	$(INSTALL_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql
 	$(INSTALL_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql/passwords
 	$(INSTALL_FILE) etc/x2gosql/sql                $(DESTDIR)$(ETCDIR)/x2gosql
-	$(INSTALL_DIR)  $(DESTDIR)/etc/tmpfiles.d || true
-	$(INSTALL_FILE) etc/tmpfiles.d/x2goserver.conf $(DESTDIR)/etc/tmpfiles.d/
+	$(INSTALL_DIR)  $(DESTDIR)/${PREFIX}/lib/tmpfiles.d || true
+	$(INSTALL_FILE) lib/tmpfiles.d/x2goserver.conf $(DESTDIR)/${PREFIX}/lib/tmpfiles.d/
 
 install_man:
 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
@@ -87,8 +87,8 @@ uninstall_config:
 	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true
 	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql || true
 	$(RM_DIR)  $(DESTDIR)$(ETCDIR) || true
-	$(RM_FILE) $(DESTDIR)/etc/tmpfiles.d/x2goserver.conf
-	$(RM_DIR)  $(DESTDIR)/etc/tmpfiles.d || true
+	$(RM_FILE) $(DESTDIR)/${PREFIX}/lib/tmpfiles.d/x2goserver.conf
+	$(RM_DIR)  $(DESTDIR)/${PREFIX}/lib/tmpfiles.d || true
 
 uninstall_man:
 	for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/$$file.5.gz; done

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git