aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0012_nxcomp_makefile-uninstall+autoconf.full+lite.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/0012_nxcomp_makefile-uninstall+autoconf.full+lite.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/0012_nxcomp_makefile-uninstall+autoconf.full+lite.patch')
-rw-r--r--debian/patches/0012_nxcomp_makefile-uninstall+autoconf.full+lite.patch74
1 files changed, 74 insertions, 0 deletions
diff --git a/debian/patches/0012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/0012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
new file mode 100644
index 000000000..af778fefc
--- /dev/null
+++ b/debian/patches/0012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
@@ -0,0 +1,74 @@
+Description: Add install and uninstall stanzas to nxcomp/Makefile, honor ac dirs
+ Provide install and uninstall functionality in nxcomp/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/nxcomp/Makefile.in
++++ b/nxcomp/Makefile.in
+@@ -64,10 +64,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.
+@@ -264,12 +269,44 @@
+ 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) libXcomp.so.3 $(DESTDIR)${libdir}
++ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}
++ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}
++ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
++ $(INSTALL_DATA) MD5.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}/libXcomp.so.3
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
++ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h
++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h
++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h
++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h
++ $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.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@