This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 773d6409e17e2137f3ec2d2f38abc6c48e17f2ca Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 23 04:16:26 2019 +0200 x2goserver/Makefile: add support for $(NXLIBDIR). --- debian/changelog | 1 + x2goserver/Makefile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 77bff21..e7f396d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -103,6 +103,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium fmbindings,printing,x2goagent, xsession}}}/Makefile: apply default-if-not-specified-logic to all the other Makefiles as well. + - x2goserver/Makefile: add support for $(NXLIBDIR). * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 3fea7dd..d3dc59d 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -16,6 +16,7 @@ ETCDIR ?= /etc/x2go BINDIR ?= $(PREFIX)/bin SBINDIR ?= $(PREFIX)/sbin LIBDIR ?= $(PREFIX)/lib/x2go +NXLIBDIR ?= $(LIBDIR)/../nx MANDIR ?= $(PREFIX)/share/man SHAREDIR ?= $(PREFIX)/share/x2go @@ -51,9 +52,10 @@ build-indep: build_pod2man build_man2html BINDIR='$(BINDIR)'; \ SBINDIR='$(SBINDIR)'; \ LIBDIR='$(LIBDIR)'; \ + NXLIBDIR='$(NXLIBDIR)'; \ MANDIR='$(MANDIR)'; \ SHAREDIR='$(SHAREDIR)'; \ - for subst in 'PREFIX' 'ETCDIR' 'BINDIR' 'SBINDIR' 'LIBDIR' 'MANDIR' 'SHAREDIR'; do \ + for subst in 'PREFIX' 'ETCDIR' 'BINDIR' 'SBINDIR' 'LIBDIR' 'NXLIBDIR' 'MANDIR' 'SHAREDIR'; do \ sed -e "s#@@$${subst}@@#$${!subst}#g" "$${gen_file}" > "$${file}"; \ done; \ fi; \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git