aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-02 15:25:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-02 15:25:43 +0100
commit0c42e33b4268ea405afab4c8a512716fa5c5e31c (patch)
treea5b1b3280cba6a21215d96314b6aa9fe0f919e8f /debian
parent42f3b1442a99ede7814137f1943b389fbf6653fc (diff)
downloadnx-libs-0c42e33b4268ea405afab4c8a512716fa5c5e31c.tar.gz
nx-libs-0c42e33b4268ea405afab4c8a512716fa5c5e31c.tar.bz2
nx-libs-0c42e33b4268ea405afab4c8a512716fa5c5e31c.zip
Update 031_nx-X11_parallel-make.full.patch. Don't patch .original files in NX code tree.
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/031_nx-X11_parallel-make.full.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch
index e87918a71..496020545 100644
--- a/debian/patches/031_nx-X11_parallel-make.full.patch
+++ b/debian/patches/031_nx-X11_parallel-make.full.patch
@@ -198,31 +198,3 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
---- a/nx-X11/lib/X11/Imakefile.NX.original
-+++ b/nx-X11/lib/X11/Imakefile.NX.original
-@@ -1159,21 +1159,17 @@
-
- #ifdef SunArchitecture
- $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
-- cd $(NX_XCOMPLIBDIR) && \
-- gmake
-+ ${MAKE} -C $(NX_XCOMPLIBDIR)
-
- $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
-- cd ../../../nxcompext && \
-- gmake
-+ ${MAKE} -C ../../../nxcompext
-
- #else
- $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
-- cd $(NX_XCOMPLIBDIR) && \
-- make
-+ ${MAKE} -C $(NX_XCOMPLIBDIR)
-
- $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
-- cd ../../../nxcompext && \
-- make
-+ ${MAKE} -C ../../../nxcompext
-
- #endif
-