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/programs/Xserver | |
| 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/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index ed49313ee..3c7e68597 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -213,12 +213,12 @@ NXAGENTDDXDIR = hw NXAGENTDIRS = $(STDDIRS) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS) NX_XCOMP_HEADERS = \ - ../../../nxcomp/MD5.h \ - ../../../nxcomp/NXalert.h \ - ../../../nxcomp/NX.h \ - ../../../nxcomp/NXpack.h \ - ../../../nxcomp/NXproto.h \ - ../../../nxcomp/NXvars.h \ + ../../../nxcomp/include/MD5.h \ + ../../../nxcomp/include/NXalert.h \ + ../../../nxcomp/include/NX.h \ + ../../../nxcomp/include/NXpack.h \ + ../../../nxcomp/include/NXproto.h \ + ../../../nxcomp/include/NXvars.h \ $(NULL) NX_XCOMPSHAD_HEADERS = \ @@ -315,7 +315,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L/usr/sfw/lib \ - -L../../../nxcomp \ + -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ -lrt \ -lXcomp \ @@ -330,7 +330,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \ -lXext \ $(NULL) #elif defined(cygwinArchitecture) -NXAGENTNXLIBS = -L../../../nxcomp \ +NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ -lXcomp \ -lXcompshad \ @@ -343,7 +343,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \ -lXext \ $(NULL) #elif defined(OpenBSDArchitecture) -NXAGENTNXLIBS = -L../../../nxcomp \ +NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -L../../../nx-X11/exports/lib \ -L../../../nxcompshad/src/.libs \ -lkvm \ @@ -359,7 +359,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \ -lXext \ $(NULL) #else -NXAGENTNXLIBS = -L../../../nxcomp \ +NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ -lXcomp \ -lXcompshad \ |