aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-14 16:09:17 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-14 16:09:17 +0100
commit071e41b6c70f94eabf3fa34f76c28227d62cec7f (patch)
tree5a7237a1366345a6171b54d5a594c996ceca7190
parente4a7baf15897377788a9df93d59521fa307af519 (diff)
downloadnx-libs-071e41b6c70f94eabf3fa34f76c28227d62cec7f.tar.gz
nx-libs-071e41b6c70f94eabf3fa34f76c28227d62cec7f.tar.bz2
nx-libs-071e41b6c70f94eabf3fa34f76c28227d62cec7f.zip
Makefile: Assure that nx-X11's Makefiles are created after everything has been defined.
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ada87517d..0215cac3a 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)"