diff options
| author | Orion Poplawski <orion@cora.nwra.com> | 2013-02-12 08:13:37 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-02-12 08:13:54 +0100 |
| commit | d439556ff1b83aecb10991cf0f031fd4da23494e (patch) | |
| tree | 27551ef7f6c433398026abfe3bee99ce1e7bffa5 | |
| parent | cf521a4b6c4362a7160adbbcc83e3771e671d5d4 (diff) | |
| download | nx-libs-d439556ff1b83aecb10991cf0f031fd4da23494e.tar.gz nx-libs-d439556ff1b83aecb10991cf0f031fd4da23494e.tar.bz2 nx-libs-d439556ff1b83aecb10991cf0f031fd4da23494e.zip | |
Fix wrong symlink direction of libNX_* files. (Fixes: #107).
| -rw-r--r-- | debian/Makefile.nx-libs | 14 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 93c7627f2..74f0d3a38 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -92,22 +92,18 @@ install-full: # copy headers (for libnx-x11-dev) cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include - # copy libs (for libnx-x11) - find nx-X11/exports/lib/ | egrep "^.*\.so$$" | while read libpath; do \ + # copy libs (for libnx-x11), we want the targets of the links + find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \ libfile=$$(basename $$libpath); \ libdir=$$(dirname $$libpath); \ + link=$$(readlink $$libpath); \ \ mkdir -p $${libdir//exports/.build-exports}; \ - cp -L $$libpath $${libdir//exports/.build-exports}; \ - \ - find $$libdir/$$libfile.* | while read symlink; do \ - ln -s $$libfile $${libdir//exports/.build-exports}/$$(basename $$symlink); \ - done; \ + cp -a $${libpath/$$libfile/$$link} $${libdir//exports/.build-exports}; \ done; $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11 - $(INSTALL_FILE) nx-X11/.build-exports/lib/*.so $(DESTDIR)$(NXLIBDIR)/X11/ - $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so.* $(DESTDIR)$(NXLIBDIR)/X11/ + $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(NXLIBDIR)/X11/ find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \ while read dirname; do \ diff --git a/debian/changelog b/debian/changelog index b7f95fec6..e437dc2d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low + [ Mike Gabriel ] * Remove duplicate install of nxproxy from main Makefile. Spotted by Jan Engelhard. + [ Orion Poplawski ] + * Fix wrong symlink direction of libNX_* files. (Fixes: #107). + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100 nx-libs (2:3.5.0.17-0) unstable; urgency=low |