diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-28 23:18:58 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-28 23:18:58 +0100 |
| commit | 3c2fe1ace2ce02a02d65d6eeb0ae05b2da395ab1 (patch) | |
| tree | b6292d75e77fc3c62f54a28958f2ac738b405cf8 /debian/patches/002_nxcompshad_build-against-nx-x11-only.patch | |
| parent | 082c8ae3a7a46a62367e2c2ffca637c363ac6c53 (diff) | |
| download | nx-libs-3c2fe1ace2ce02a02d65d6eeb0ae05b2da395ab1.tar.gz nx-libs-3c2fe1ace2ce02a02d65d6eeb0ae05b2da395ab1.tar.bz2 nx-libs-3c2fe1ace2ce02a02d65d6eeb0ae05b2da395ab1.zip | |
Change naming scheme of patch files.
Diffstat (limited to 'debian/patches/002_nxcompshad_build-against-nx-x11-only.patch')
| -rw-r--r-- | debian/patches/002_nxcompshad_build-against-nx-x11-only.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch b/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch new file mode 100644 index 000000000..975e63010 --- /dev/null +++ b/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch @@ -0,0 +1,32 @@ +Build nxcompshad against own nx-X11 sources instead of the system's X11. +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -48,7 +48,7 @@ + CCDEFINES = + + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 ++LIBS = @LIBS@ -lX11 + + # + # Only if THREADS is defined. +@@ -162,7 +162,7 @@ + -Wl,--enable-auto-import \ + -Wl,--whole-archive ${LIBARCHIVE} \ + -Wl,--no-whole-archive \ +- ${LIBS} -L/usr/X11R6/lib ++ ${LIBS} + + $(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL) + # $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS) +--- a/nxcompshad/configure.in ++++ b/nxcompshad/configure.in +@@ -19,7 +19,7 @@ + + if test -d "../nx-X11/exports/include" ; then + CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" +- LIBS="$LIBS -L../nx-X11/exports/lib" ++ LIBS="-L../nx-X11/exports/lib" + fi + + dnl Check whether --with-ipaq was given. |