diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-07-26 10:38:46 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-07-26 10:38:46 +0200 |
| commit | 7897834ce578dc394649ed09acb9f95fc04915ff (patch) | |
| tree | a0bcbfa2c4ae1111ad3d49390c7abd0ae3a9a2ed /nx-X11/lib | |
| parent | 9193d11eeeea933e293acd5e0f03fa4e9887186b (diff) | |
| parent | 4afc641fdd8c03bd708f50e0c3691b5de7ea1dba (diff) | |
| download | nx-libs-7897834ce578dc394649ed09acb9f95fc04915ff.tar.gz nx-libs-7897834ce578dc394649ed09acb9f95fc04915ff.tar.bz2 nx-libs-7897834ce578dc394649ed09acb9f95fc04915ff.zip | |
Merge branch 'sunweaver-pr/nxcomp-autoreconf' into 3.6.x
Attributes GH PR #480: https://github.com/ArcticaProject/nx-libs/pull/480
Diffstat (limited to 'nx-X11/lib')
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 5b289fae8..a6471bff1 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -36,9 +36,9 @@ BuildIncludes($(HEADERS),IncSubdir,..) #if NXLibraries #ifdef SunArchitecture -NX_INCLUDES = -I../../../nxcomp -I/usr/sfw/include +NX_INCLUDES = -I../../../nxcomp/include -I/usr/sfw/include #else -NX_INCLUDES = -I../../../nxcomp +NX_INCLUDES = -I../../../nxcomp/include #endif NX_DEFINES = -DNX_TRANS_SOCKET \ @@ -81,7 +81,7 @@ NX_XCOMPLIBNAME = libXcomp.so NX_XCOMPEXTLIBNAME = libXcompext.so #endif -NX_XCOMPLIBDIR = $(XTOP)/../nxcomp +NX_XCOMPLIBDIR = $(XTOP)/../nxcomp/src/.libs NX_XCOMPLIBLINK = Xcomp NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK) |