[X2Go-Commits] [x2goserver] 03/07: x2goserver/Makefile: install and uninstall etc/tmpfiles.d/x2goserver.conf.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 24 11:57:41 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit f4ba504e814fbedce28c46a7620384e4bd43c04b
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Jan 24 10:09:36 2018 +0100
x2goserver/Makefile: install and uninstall etc/tmpfiles.d/x2goserver.conf.
Cherry-picked from release/4.0.1.x branch.
Moved into x2goserver-common package.
---
debian/changelog | 2 ++
x2goserver-common/Makefile | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 20e8082..0f80d8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -384,6 +384,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
- x2goserver/bin/x2gostartagent: check and adapt exit codes.
- x2goserver/etc: add new tmpfiles.d/x2goserver.conf file, protecting
session directories from systemd's tmpfiles deletion.
+ - x2goserver/Makefile: install and uninstall
+ etc/tmpfiles.d/x2goserver.conf.
* x2goserver.spec:
- RPMify x2goserver-xsession description.
- Remove qt4 stuff, we're not using the framework here.
diff --git a/x2goserver-common/Makefile b/x2goserver-common/Makefile
index 40b9dd9..c3c6565 100755
--- a/x2goserver-common/Makefile
+++ b/x2goserver-common/Makefile
@@ -64,6 +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_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
@@ -85,6 +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
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
More information about the x2go-commits
mailing list