diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:20:51 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:20:51 +0200 |
| commit | cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa (patch) | |
| tree | e22b443672f84f9305e682f2c6c0d0e896b967a6 /Makefile | |
| parent | 9e2588e56f5b712c4501a19c1f723257c05aa6af (diff) | |
| parent | c4c5485474a03bcfd2632d12c2e6e88ba20be471 (diff) | |
| download | nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.gz nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.bz2 nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.zip | |
Merge branch 'sunweaver-pr/switch-to-libXfont2-API' into 3.6.x
Attributes GH PR #362: https://github.com/ArcticaProject/nx-libs/pull/362
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -19,6 +19,10 @@ USRLIBDIR ?= $(NXLIBDIR)/X11 INCLUDEDIR ?= $(PREFIX)/include CONFIGURE ?= ./configure +# use Xfont2 if available in the build env +FONT_DEFINES ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-DHAS_XFONT2") +XFONTLIB ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-lXfont2" || echo "-lXfont") + NX_VERSION_MAJOR=$(shell ./version.sh 1) NX_VERSION_MINOR=$(shell ./version.sh 2) NX_VERSION_MICRO=$(shell ./version.sh 3) @@ -75,7 +79,8 @@ build-full: cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE} ./mesa-quilt push -a - cd nx-X11 && ${MAKE} World USRLIBDIR=$(USRLIBDIR) SHLIBDIR=$(SHLIBDIR) + + cd nx-X11 && ${MAKE} World USRLIBDIR=$(USRLIBDIR) SHLIBDIR=$(SHLIBDIR) FONT_DEFINES=$(FONT_DEFINES) XFONTLIB=$(XFONTLIB) cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} |