This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit f5a687416e83e6d2ca064b734fa7e890e2d02093 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 23 04:28:35 2019 +0200 x2goserver/bin/x2gopath.in: fix warning message to also include SHAREDIR. --- debian/changelog | 2 ++ x2goserver/bin/x2gopath.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 050a239..96f3b82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -105,6 +105,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium default-if-not-specified-logic to all the other Makefiles as well. - x2goserver/Makefile: add support for $(NXLIBDIR). - x2goserver/bin/x2gopath.in: switch to bash. + - x2goserver/bin/x2gopath.in: fix warning message to also include + SHAREDIR. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in index f8b2e47..29a9b4f 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -40,8 +40,8 @@ fi typeset x2go_share_subdir="${installed_sharedir#${installed_prefix}}" typeset x2go_lib_subdir="${installed_libdir#${installed_prefix}}" -if [ "${x2go_lib_subdir}" = "${installed_libdir}" ]; then - printf 'WARNING: X2Go Server was built with a LIBDIR (%s) not starting with PREFIX (%s). Such a setup will likely not work correctly.\n' "${installed_libdir}" "${installed_prefix}" >&2 +if [ "${x2go_share_subdir}" = "${installed_sharedir}" ] || [ "${x2go_lib_subdir}" = "${installed_libdir}" ]; then + printf 'WARNING: X2Go Server was built with a SHAREDIR (%s) or LIBDIR (%s) not starting with PREFIX (%s). Such a setup will likely not work correctly.\n' "${installed_sharedir}" "${installed_libdir}" "${installed_prefix}" >&2 fi # Try to fetch the system library dir. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git