Commit 258902be authored by Orion Poplawski's avatar Orion Poplawski Committed by Mike Gabriel

Avoid building of libxcomp1 (which actually is identical to libxcomp3, just with…

Avoid building of libxcomp1 (which actually is identical to libxcomp3, just with a wrong name). (Fixes: #104).
parent d439556f
......@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low
[ Orion Poplawski ]
* Fix wrong symlink direction of libNX_* files. (Fixes: #107).
* Avoid building of libxcomp1 (which actually is identical to libxcomp3,
just with a wrong name). (Fixes: #104).
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100
......
--- a/nx-X11/lib/X11/Imakefile 2013-01-04 05:25:49.000000000 -0700
+++ b/nx-X11/lib/X11/Imakefile 2013-01-15 15:26:07.969167259 -0700
@@ -63,7 +63,6 @@ NX_XCOMPLIBDIR = $(XTOP)/../nxcomp
NX_XCOMPLIBLINK = Xcomp
NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
-NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status
NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext
@@ -1181,17 +1180,9 @@ lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOM
all:: $(NX_XCOMPLIBTARGET)
-$(NX_XCOMPDEPTARGET):
- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
-
depend:: $(NX_XCOMPLIBTARGET)
-all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET)
-
-clean::
- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
+all:: $(NX_XCOMPEXTLIBTARGET)
#endif
......@@ -26,6 +26,7 @@
031_nx-X11_parallel-make.full.patch
051_nxcomp_macos105-fdisset.full+lite.patch
052_nxcomp_macos10-nxauth-location.full+lite.patch
053_nx-X11_no-xcomp1-install-target.full.patch
101_nxagent_set-rgb-path.full.patch
102_xserver-xext_set-securitypolicy-path.full.patch
103_nxagent_set-X0-config-path.full.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment