This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 759c973e4dde1f64a171b7819be819169c35427f Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:00:00 2018 +0100 x2goserver/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/. File should not be modified by users. --- debian/changelog | 2 ++ x2goserver/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 058a282..c06f990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium etc/tmpfiles.d/x2goserver.conf. - x2goserver-xsession/etc/Xsession: change interpreter to bash. Some tests do not work in other shells. + - x2goserver/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/. + File should not be modified by users. * x2goserver.spec: - RPMify x2goserver-xsession description. - Remove qt4 stuff, we're not using the framework here. diff --git a/x2goserver/Makefile b/x2goserver/Makefile index e7b9698..1128fbb 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -89,8 +89,8 @@ install_config: $(INSTALL_FILE) etc/sudoers.d/x2goserver $(DESTDIR)/etc/sudoers.d/ $(INSTALL_DIR) $(DESTDIR)/etc/logcheck/ignore.d.server || true $(INSTALL_FILE) etc/logcheck/ignore.d.server/x2goserver $(DESTDIR)/etc/logcheck/ignore.d.server/ - $(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) gen-lib/tmpfiles.d/x2goserver.conf $(DESTDIR)/${PREFIX}/lib/tmpfiles.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -129,8 +129,8 @@ uninstall_config: $(RM_FILE) $(DESTDIR)/etc/logcheck/ignore.d.server/x2goserver $(RM_DIR) $(DESTDIR)/etc/logcheck/ignore.d.server || true $(RM_DIR) $(DESTDIR)/etc/logcheck || 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)/man8/$$file.8.gz; done -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git