[X2Go-Commits] [x2goserver] 10/17: Makefile: specify SHAREDIR as a default-if-not-specified variable.

[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 073cdefb50eb94df82b97159c5f0022c50c7661a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 22 06:28:51 2019 +0200

    Makefile: specify SHAREDIR as a default-if-not-specified variable.
---
 Makefile         | 2 +-
 debian/changelog | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f100925..ba24cf1 100755
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ DESTDIR ?=
 PREFIX ?= /usr/local
 ETCDIR=/etc/x2go
 LIBDIR ?= $(PREFIX)/lib/x2go
-SHAREDIR=$(PREFIX)/share/x2go
+SHAREDIR ?= $(PREFIX)/share/x2go
 
 PERL ?= /usr/bin/perl
 PERL_INSTALLDIRS ?= vendor
diff --git a/debian/changelog b/debian/changelog
index 2933cd5..e3769fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -97,6 +97,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
     - x2goserver/bin/x2gopath.in: hardcode LIBDIR, PREFIX and SHAREDIR at
       build time, but also allow re-rooting afterwards - derived from the
       original values.
+    - Makefile: specify SHAREDIR as a default-if-not-specified variable.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:

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