[X2Go-Commits] [x2goserver] 03/50: x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time.

git-admin at x2go.org git-admin at x2go.org
Thu Jan 14 05:13:49 CET 2016


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

x2go pushed a commit to branch feature/x2goserver-xsettings
in repository x2goserver.

commit 21c697cb711b2677176358940da574aecf104e52
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 23 02:55:37 2014 +0100

    x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time.
    
    Don't use '/' as sed replace command separator for... paths. Bad idea,
    who would have guessed.
---
 x2goserver/Makefile                      |    1 +
 x2goserver/bin/{x2gopath => x2gopath.in} |    1 +
 2 files changed, 2 insertions(+)

diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index ee1891c..3deb452 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -37,6 +37,7 @@ build: build-arch build-indep
 build-arch:
 
 build-indep: build_man2html
+	sed -e 's,@@SYSCONFDIR@@,$(ETCDIR),' bin/x2gopath.in > bin/x2gopath
 
 build_man2html:
 	if [ -n "$(MAN2HTML_BIN)" ]; then \
diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath.in
similarity index 97%
rename from x2goserver/bin/x2gopath
rename to x2goserver/bin/x2gopath.in
index 43903c4..497c284 100755
--- a/x2goserver/bin/x2gopath
+++ b/x2goserver/bin/x2gopath.in
@@ -32,6 +32,7 @@ base=$(readlink -f "$base/..");
 # The following section is subject to substitution by distro packaging tools.
 case "$1" in
 	"base") printf '%s' "$base";;
+	"etc") printf '%s' "@@SYSCONFDIR@@";;
 	"lib") printf '%s' "$base/lib/x2go";;
 	"libexec") printf '%s' "$base/lib/x2go";;
 	"share") printf '%s' "$base/share/x2go";;

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list