aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
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-03 05:09:14 +0100
commitc70f524507f800cf3b032f84dd0b31146e84b9f9 (patch)
tree4d13555723bd69e7fcfc84dc1ddc15bd9d0a7786 /debian/patches
parente743a6f7be9c2c440b1a3a65953a97640be63f30 (diff)
downloadnx-libs-c70f524507f800cf3b032f84dd0b31146e84b9f9.tar.gz
nx-libs-c70f524507f800cf3b032f84dd0b31146e84b9f9.tar.bz2
nx-libs-c70f524507f800cf3b032f84dd0b31146e84b9f9.zip
Update 031_nx-X11_parallel-make.full.patch. Don't patch .original files in NX code tree.
Diffstat (limited to 'debian/patches')
-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
-