aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 22:40:15 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 22:40:15 +0100
commitc621c22f820ec22fe7daabf37b7b577a41a3298f (patch)
tree519e1c46cfa0d312cc6ec49e31c6dc099947c701 /debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
parent4d6e1c4fbe549a77caa5ba0fc60e1bf668bf4a4b (diff)
downloadnx-libs-c621c22f820ec22fe7daabf37b7b577a41a3298f.tar.gz
nx-libs-c621c22f820ec22fe7daabf37b7b577a41a3298f.tar.bz2
nx-libs-c621c22f820ec22fe7daabf37b7b577a41a3298f.zip
Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already existing Makefile patches (012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_...).
Diffstat (limited to 'debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch')
-rw-r--r--debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
new file mode 100644
index 000000000..934973ca5
--- /dev/null
+++ b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
@@ -0,0 +1,64 @@
+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 <mike.gabriel@das-netzwerkteam.de>
+Author: Jan Engelhardt <jengelh@medozas.de>
+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,33 @@
+ fi
+ touch depend.status
+
+-install: install.bin install.man
++install: install.bin install.lib install.man
+
+ install.bin:
+
++install.lib: all
++ ./mkinstalldirs $(DESTDIR)${libdir}/nx
++ ./mkinstalldirs $(DESTDIR)${includedir}/nx
++ $(INSTALL_DATA) libXcompext.so.* $(DESTDIR)${libdir}/nx
++ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx
++ $(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}/nx/libXcompext.so.*
++ $(RM_FILE) $(DESTDIR)${libdir}/nx/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@