From 09d2732b4e299eaa06c64b7a683529e337691c59 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 16:23:43 +0100 Subject: Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification. --- ...xcompext_makefile-uninstall+autoconf.full.patch | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 debian/patches/0013_nxcompext_makefile-uninstall+autoconf.full.patch (limited to 'debian/patches/0013_nxcompext_makefile-uninstall+autoconf.full.patch') diff --git a/debian/patches/0013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/0013_nxcompext_makefile-uninstall+autoconf.full.patch new file mode 100644 index 000000000..300c0a39e --- /dev/null +++ b/debian/patches/0013_nxcompext_makefile-uninstall+autoconf.full.patch @@ -0,0 +1,66 @@ +Description: Add install and uninstall stanzas to nxcompext/Makefile, honor autoconf dirs. + Provide install and uninstall functionality in nxcompext/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 +Author: Jan Engelhardt +Last-Update: 2012-02-14 +--- a/nxcompext/Makefile.in ++++ b/nxcompext/Makefile.in +@@ -56,11 +56,15 @@ + bindir = @bindir@ + man1dir = @mandir@/man1 + VPATH = @srcdir@ ++libdir = @libdir@ ++includedir = @includedir@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ +- ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f + # + # This should be autodetected. + # +@@ -147,12 +151,35 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ ./mkinstalldirs $(DESTDIR)${libdir} ++ ./mkinstalldirs $(DESTDIR)${includedir}/nx ++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} ++ $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir} ++ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir} ++ $(INSTALL_DATA) NX*.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}/libXcompext.so.3 ++ $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ + @ALL@ -- cgit v1.2.3