Skip to content

N
nx-libs
Commit c26e4bd8 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Update patches: 012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_.... Also make…

Update patches: 012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_.... Also make use of $(LIBFULL) in Makefile.in's install and uninstall stanzas. Inspired by Jan Engelhardt's so-version.diff patch. However, the version name change requested in that patch has been rejected for NX (redistributed).
parent b99168fc
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 7 deletions
debian/changelog
View file @ c26e4bd8
...@@ -17,6 +17,11 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low ...@@ -17,6 +17,11 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
* Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...).
* Update patch: 001_add-main-makefile.full+lite.patch, fix missing * Update patch: 001_add-main-makefile.full+lite.patch, fix missing
$(CONFIGURE) variable. $(CONFIGURE) variable.
* Update patches: 012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_....
Also make use of $(LIBFULL) in Makefile.in's install and uninstall stanzas.
Inspired by Jan Engelhardt's so-version.diff patch. However, the version
name change requested in that patch has been rejected for
NX (redistributed).
[ Jan Engelhardt ] [ Jan Engelhardt ]
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
......
debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
View file @ c26e4bd8
...@@ -38,7 +38,7 @@ Last-Update: 2012-02-14 ...@@ -38,7 +38,7 @@ Last-Update: 2012-02-14
+install.lib: all +install.lib: all
+ ./mkinstalldirs $(DESTDIR)${libdir}/nx + ./mkinstalldirs $(DESTDIR)${libdir}/nx
+ ./mkinstalldirs $(DESTDIR)${includedir}/nx + ./mkinstalldirs $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) libXcomp.so.3.* $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx
+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}/nx
+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}/nx
+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}/nx
...@@ -53,7 +53,7 @@ Last-Update: 2012-02-14 ...@@ -53,7 +53,7 @@ Last-Update: 2012-02-14
+uninstall.bin: +uninstall.bin:
+ +
+uninstall.lib: +uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3.* + $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.a + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.a
......
debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
View file @ c26e4bd8
...@@ -27,7 +27,7 @@ Last-Update: 2012-02-14 ...@@ -27,7 +27,7 @@ Last-Update: 2012-02-14
# #
# This should be autodetected. # This should be autodetected.
# #
@@ -147,12 +151,33 @@ @@ -147,12 +151,35 @@
fi fi
touch depend.status touch depend.status
...@@ -39,7 +39,8 @@ Last-Update: 2012-02-14 ...@@ -39,7 +39,8 @@ Last-Update: 2012-02-14
+install.lib: all +install.lib: all
+ ./mkinstalldirs $(DESTDIR)${libdir}/nx + ./mkinstalldirs $(DESTDIR)${libdir}/nx
+ ./mkinstalldirs $(DESTDIR)${includedir}/nx + ./mkinstalldirs $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) libXcompext.so.* $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx
+ $(INSTALL_DATA) libXcompext.so.3 $(DESTDIR)${libdir}/nx
+ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx
+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true + echo "Running ldconfig tool, this may take a while..." && ldconfig || true
...@@ -51,7 +52,8 @@ Last-Update: 2012-02-14 ...@@ -51,7 +52,8 @@ Last-Update: 2012-02-14
+uninstall.bin: +uninstall.bin:
+ +
+uninstall.lib: +uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.* + $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.3
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
......
debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
View file @ c26e4bd8
...@@ -40,7 +40,7 @@ Last-Update: 2012-02-14 ...@@ -40,7 +40,7 @@ Last-Update: 2012-02-14
+install.lib: all +install.lib: all
+ $(INSTALL_DIR) $(DESTDIR)${libdir}/nx + $(INSTALL_DIR) $(DESTDIR)${libdir}/nx
+ $(INSTALL_DIR) $(DESTDIR)${includedir}/nx + $(INSTALL_DIR) $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) libXcompshad.so.3.* $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx
+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}/nx
+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}/nx
+ $(INSTALL_DATA) *.a $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) *.a $(DESTDIR)${libdir}/nx
...@@ -54,7 +54,7 @@ Last-Update: 2012-02-14 ...@@ -54,7 +54,7 @@ Last-Update: 2012-02-14
+uninstall.bin: +uninstall.bin:
+ +
+uninstall.lib: +uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3.* + $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.a + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.a
......
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