[X2Go-Commits] [x2goclient] 02/03: Makefile: make controllable variables default-if-not-set to allow overriding via the environment.

git-admin at x2go.org git-admin at x2go.org
Sun May 16 15:33:35 CEST 2021


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 16bb4d7bb421bdc1ba5952d0afd196b7d3b812d7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun May 16 15:27:11 2021 +0200

    Makefile: make controllable variables default-if-not-set to allow overriding via the environment.
---
 Makefile         | 42 +++++++++++++++++++++---------------------
 debian/changelog |  2 ++
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 0e116f2..781622d 100755
--- a/Makefile
+++ b/Makefile
@@ -10,35 +10,35 @@ SHELL=/bin/bash
 # We'll change this to Qt 5 as soon as Qt-4-based platforms go EOL.
 QT_VERSION ?= 4
 
-INSTALL_DIR=install -d -o root -g root -m 755
-INSTALL_FILE=install -o root -g root -m 644
-INSTALL_SYMLINK=ln -s -f
-INSTALL_PROGRAM=install -o root -g root -m 755
-
-RM_FILE=rm -f
-RM_DIR=rmdir -p --ignore-fail-on-non-empty
-
-DESTDIR=
-PREFIX=/usr/local
-ETCDIR=/etc/x2go
-BINDIR=$(PREFIX)/bin
-SHAREDIR=$(PREFIX)/share
-MANDIR=$(SHAREDIR)/man
+INSTALL_DIR ?= install -d -o root -g root -m 755
+INSTALL_FILE ?= install -o root -g root -m 644
+INSTALL_SYMLINK ?= ln -s -f
+INSTALL_PROGRAM ?= install -o root -g root -m 755
+
+RM_FILE ?= rm -f
+RM_DIR ?= rmdir -p --ignore-fail-on-non-empty
+
+DESTDIR ?=
+PREFIX ?= /usr/local
+ETCDIR ?= /etc/x2go
+BINDIR ?= $(PREFIX)/bin
+SHAREDIR ?= $(PREFIX)/share
+MANDIR ?= $(SHAREDIR)/man
 ifeq ($(QT_VERSION),4)
-  QMAKE_BINARY := qmake-qt4
-  LRELEASE_BINARY := lrelease-qt4
+  QMAKE_BINARY ?= qmake-qt4
+  LRELEASE_BINARY ?= lrelease-qt4
 else
   ifeq ($(QT_VERSION),5)
-    QMAKE_BINARY := qmake
-    LRELEASE_BINARY := lrelease
+    QMAKE_BINARY ?= qmake
+    LRELEASE_BINARY ?= lrelease
   else
     $(error Unsupported Qt version "$(QT_VERSION)" passed.)
   endif
 endif
-QMAKE_OPTS=
+QMAKE_OPTS ?=
 
-LDFLAGS=
-LIBS=
+LDFLAGS ?=
+LIBS ?=
 
 
 #####################################################################
diff --git a/debian/changelog b/debian/changelog
index 0e89a0a..c8cf473 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
     - x2goclient.spec: rework Qt5 dependencies. Use a common set of
       PkgConfig()-based dependencies for the Qt 5 libraries themselves and
       only make the linguist tools (lrelease) conditional.
+    - Makefile: make controllable variables default-if-not-set to allow
+      overriding via the environment.
   * debian/control:
     + Move to debian/control.in.
   * debian/control.in:

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


More information about the x2go-commits mailing list