[X2Go-Commits] [nx-libs] 12/14: Makefile: Assure that nx-X11's Makefiles are created after everything has been defined.
git-admin at x2go.org
git-admin at x2go.org
Thu Nov 22 09:33:01 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit 071e41b6c70f94eabf3fa34f76c28227d62cec7f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Nov 14 16:09:17 2018 +0100
Makefile: Assure that nx-X11's Makefiles are created after everything has been defined.
---
Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Makefile b/Makefile
index ada8751..0215cac 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,9 @@ imakeconfig:
(pkg-config --exists xkbcomp && echo "#define SystemXkbConfigDir `pkg-config xkbcomp --variable=xkbconfigdir`"; :) >>nx-X11/config/cf/nxconfig.def
(pkg-config --exists xkbcomp && echo "#define SystemXkbBinDir `pkg-config xkbcomp --variable=prefix`/bin"; :) >>nx-X11/config/cf/nxconfig.def
+ # let's create the nx-X11 Makefiles now, once everything has been defined
+ $(MAKE) -j1 -C nx-X11 Makefiles IMAKE_DEFINES="$(IMAKE_DEFINES)"
+
build-env: version imakeconfig
# prepare Makefiles and the nx-X11 symlinking magic
${MAKE} -j1 -C nx-X11 BuildIncludes IMAKE_DEFINES="$(IMAKE_DEFINES)"
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list