[X2Go-Commits] [x2gokdrive] 12/28: debian/rules: avoid backticks, use $() instead.
git-admin at x2go.org
git-admin at x2go.org
Sat Oct 26 23:00:31 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdrive.
commit fc54666bf7d59dfd1e7d808389f0280c05f872e5
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Oct 24 22:51:26 2019 +0200
debian/rules: avoid backticks, use $() instead.
---
debian/changelog | 1 +
debian/rules | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f686442..4917e50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,5 +21,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
+ Whitespace-only fixes.
+ Move options to the front of commands.
+ Drop useless use of cat.
+ + Avoid backticks, use $() instead.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200
diff --git a/debian/rules b/debian/rules
index 4d0a590..d95c7ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_auto_configure:
cp -r $(CURDIR)/man/ BUILD/xorg-server/hw/kdrive/x2gokdrive/
# patch xorg-server build tree, so that it will build x2gokdrive
- set -x; export XORG_UPSTREAM_VERSION=`grep AC_INIT $(CURDIR)/BUILD/xorg-server/configure.ac | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/'` \
+ set -x; export XORG_UPSTREAM_VERSION=$$(grep AC_INIT $(CURDIR)/BUILD/xorg-server/configure.ac | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/') \
&& cd $(CURDIR)/BUILD/xorg-server \
&& test -d ../../patches.xorg/$$XORG_UPSTREAM_VERSION && QUILT_PATCHES=../../patches.xorg/$$XORG_UPSTREAM_VERSION/ quilt push -a \
|| ( set +x; echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $$XORG_UPSTREAM_VERSION.\n##################################################\n"; exit 1)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
More information about the x2go-commits
mailing list