aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0014_nxcompshad_makefile-uninstall+autoconf.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
commit09d2732b4e299eaa06c64b7a683529e337691c59 (patch)
tree3a07c4a95980c0f34b1d3ce2f55388dd7677c685 /debian/patches/0014_nxcompshad_makefile-uninstall+autoconf.full.patch
parent8c98a401b49506f969dc9263d9bd566e5b31a572 (diff)
downloadnx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.gz
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.bz2
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.zip
Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification.
Diffstat (limited to 'debian/patches/0014_nxcompshad_makefile-uninstall+autoconf.full.patch')
-rw-r--r--debian/patches/0014_nxcompshad_makefile-uninstall+autoconf.full.patch70
1 files changed, 70 insertions, 0 deletions
diff --git a/debian/patches/0014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/0014_nxcompshad_makefile-uninstall+autoconf.full.patch
new file mode 100644
index 000000000..921eccc4f
--- /dev/null
+++ b/debian/patches/0014_nxcompshad_makefile-uninstall+autoconf.full.patch
@@ -0,0 +1,70 @@
+Description: Add install and uninstall stanzas to nxcompshad/Makefile, honor autoconf dirs
+ Provide install and uninstall functionality in nxcompshad/Makefile.
+ .
+ Honor autoconf's libdir (and includedir, while at it). This is a
+ must-have for multiarch platforms like x86_64 et al where multiple
+ forms of libraries can be installed at the same time.
+Forwarded: pending...
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Author: Jan Engelhardt <jengelh@medozas.de>
+Last-Update: 2012-02-14
+--- a/nxcompshad/Makefile.in
++++ b/nxcompshad/Makefile.in
+@@ -74,10 +74,17 @@
+ bindir = @bindir@
+ man1dir = @mandir@/man1
+ VPATH = @srcdir@
++libdir = @libdir@
++includedir = @includedir@
+
+ INSTALL = @INSTALL@
++INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_LINK = cp -av
++DESTDIR =
++RM_FILE = rm -f
++RM_DIR = rmdir -p --ignore-fail-on-non-empty
+
+ #
+ # This should be autodetected.
+@@ -178,12 +185,38 @@
+ fi
+ touch depend.status
+
+-install: install.bin install.man
++install: install.bin install.lib install.man
+
+ install.bin:
+
++install.lib: all
++ $(INSTALL_DIR) $(DESTDIR)${libdir}
++ $(INSTALL_DIR) $(DESTDIR)${includedir}/nx
++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
++ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}
++ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}
++ $(INSTALL_DATA) *.a $(DESTDIR)${libdir}
++ $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx
++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
++
+ install.man:
+
++uninstall: uninstall.bin uninstall.lib uninstall.man
++
++uninstall.bin:
++
++uninstall.lib:
++ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
++ for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
++ $(RM_DIR) $(DESTDIR)${libdir}/nx/
++ $(RM_DIR) $(DESTDIR)${includedir}/nx/
++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
++
++uninstall.man:
++
+ clean:
+ -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \
+ $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe