This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 9603457a5bb779c0beffbfbe3f1971d0b658cdc1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 06:37:46 2019 +0200 {libx2go-server-db-perl,x2goserver{,-{common,desktopsharing,extensions,fmbindings,printing,x2goagent,xsession}}}/Makefile: apply default-if-not-specified-logic to all the other Makefiles as well. --- debian/changelog | 4 ++++ libx2go-server-db-perl/Makefile | 12 ++++++------ x2goserver-common/Makefile | 12 ++++++------ x2goserver-desktopsharing/Makefile | 10 +++++----- x2goserver-extensions/Makefile | 10 +++++----- x2goserver-fmbindings/Makefile | 10 +++++----- x2goserver-printing/Makefile | 12 ++++++------ x2goserver-x2goagent/Makefile | 10 +++++----- x2goserver-xsession/Makefile | 12 ++++++------ x2goserver/Makefile | 12 ++++++------ 10 files changed, 54 insertions(+), 50 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ea1d69..77bff21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,6 +99,10 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium original values. - Makefile: specify SHAREDIR as a default-if-not-specified variable. - Makefile: same change, but for ETCDIR. + - {libx2go-server-db-perl,x2goserver{,-{common,desktopsharing,extensions, + fmbindings,printing,x2goagent, + xsession}}}/Makefile: apply + default-if-not-specified-logic to all the other Makefiles as well. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile index 14e37a3..63f57f8 100755 --- a/libx2go-server-db-perl/Makefile +++ b/libx2go-server-db-perl/Makefile @@ -16,12 +16,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go #BIN_SCRIPTS=$(shell cd bin && echo *) #SBIN_SCRIPTS=$(shell cd sbin && echo *) diff --git a/x2goserver-common/Makefile b/x2goserver-common/Makefile index fe2cb99..f65a373 100755 --- a/x2goserver-common/Makefile +++ b/x2goserver-common/Makefile @@ -12,12 +12,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) SBIN_SCRIPTS=$(shell cd sbin && echo *) diff --git a/x2goserver-desktopsharing/Makefile b/x2goserver-desktopsharing/Makefile index d896a28..e559508 100755 --- a/x2goserver-desktopsharing/Makefile +++ b/x2goserver-desktopsharing/Makefile @@ -12,11 +12,11 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 3648a92..dd0dec3 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -12,11 +12,11 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .placeholder) diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 4b68d95..f1ed6e7 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -12,11 +12,11 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 6b6743e..855f4e9 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -12,12 +12,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile index c9bc7b5..9656c90 100755 --- a/x2goserver-x2goagent/Makefile +++ b/x2goserver-x2goagent/Makefile @@ -13,12 +13,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -LIBDIR=$(PREFIX)/lib/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib/x2go NXLIBDIR ?= $(LIBDIR)/../nx -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=x2goagent $(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 80e6ccf..fc36f1f 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -13,12 +13,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go XSESSIONDIR ?= /etc/X11/Xsession.d XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 7204c1a..3fea7dd 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -12,12 +12,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) SBIN_SCRIPTS=$(shell cd sbin && echo *) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git