Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already existing Makefile patches (012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_...).

8 files changed, 213 insertions, 180 deletions

diff --git a/debian/changelog b/debian/changelog
index 1e6d1dc36..d10cc08f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
   * Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for
     macros.
   * Enable parallel build for Debian package.
+  * Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already existing
+    Makefile patches (012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_...).
 
   [ Jan Engelhardt ]
   * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
new file mode 100644
index 000000000..fbeaa39ed
--- /dev/null
+++ b/debian/patches/012_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}/nx
++	./mkinstalldirs $(DESTDIR)${includedir}/nx
++	$(INSTALL_DATA) libXcomp.so.3.*         $(DESTDIR)${libdir}/nx
++	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)${libdir}/nx
++	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)${libdir}/nx
++	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)${libdir}/nx
++	$(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}/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.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@
diff --git a/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch
deleted file mode 100644
index 36f1555f6..000000000
--- a/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Add install and uninstall stanzas to nxcomp/Makefile
- Provide install and uninstall functionality in nxcomp/Makefile.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- nx-libs.orig/nxcomp/Makefile.in	2011-12-05 09:16:34.000000000 +0100
-+++ nx-libs/nxcomp/Makefile.in	2011-12-05 09:19:28.000000000 +0100
-@@ -68,6 +68,9 @@
- 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 +267,44 @@
- 		fi
- 		touch depend.status
- 
--install:	install.bin install.man
-+install:	install.bin install.lib install.man
- 
- install.bin:
- 
-+install.lib: all
-+	./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx
-+	./mkinstalldirs $(DESTDIR)$(prefix)/include/nx
-+	$(INSTALL_DATA) libXcomp.so.3.*         $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_DATA) NX*.h                   $(DESTDIR)$(prefix)/include/nx
-+	$(INSTALL_DATA) MD5.h                   $(DESTDIR)$(prefix)/include/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)$(prefix)/lib/nx/libXcomp.so.3.*
-+	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3
-+	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so
-+	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.a
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXalert.h
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NX.h
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXmitshm.h
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXpack.h
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXproto.h
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXrender.h
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXvars.h
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/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@
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@
diff --git a/debian/patches/013_nxcompext_makefile-uninstall.full.patch b/debian/patches/013_nxcompext_makefile-uninstall.full.patch
deleted file mode 100644
index 97e4f03f6..000000000
--- a/debian/patches/013_nxcompext_makefile-uninstall.full.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Add install and uninstall stanzas to nxcompext/Makefile
- Provide install and uninstall functionality in nxcompext/Makefile.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- nx-libs.orig/nxcompext/Makefile.in	2011-12-05 09:20:15.000000000 +0100
-+++ nx-libs/nxcompext/Makefile.in	2011-12-05 09:24:37.000000000 +0100
-@@ -60,7 +60,9 @@
- 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 +149,33 @@
- 		fi
- 		touch depend.status
- 
--install:	install.bin install.man
-+install:       install.bin install.lib install.man
- 
- install.bin:
- 
-+install.lib: all
-+	./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx
-+	./mkinstalldirs $(DESTDIR)$(prefix)/include/nx
-+	$(INSTALL_DATA) libXcompext.so.*        $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_DATA) NX*.h                   $(DESTDIR)$(prefix)/include/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)$(prefix)/lib/nx/libXcompext.so.*
-+	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlib.h
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/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@
diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
new file mode 100644
index 000000000..d1a8c1e1f
--- /dev/null
+++ b/debian/patches/014_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}/nx
++	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
++	$(INSTALL_DATA) libXcompshad.so.3.*     $(DESTDIR)${libdir}/nx
++	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)${libdir}/nx
++	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)${libdir}/nx
++	$(INSTALL_DATA) *.a                     $(DESTDIR)${libdir}/nx
++	$(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}/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.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
diff --git a/debian/patches/014_nxcompshad_makefile-uninstall.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall.full.patch
deleted file mode 100644
index 1a7888546..000000000
--- a/debian/patches/014_nxcompshad_makefile-uninstall.full.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Add install and uninstall stanzas to nxcompshad/Makefile
- Provide install and uninstall functionality in nxcompshad/Makefile.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- a/nxcompshad/Makefile.in
-+++ b/nxcompshad/Makefile.in
-@@ -76,8 +76,13 @@
- VPATH       = @srcdir@
- 
- 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 +183,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)$(prefix)/lib/nx
-+	$(INSTALL_DIR)                          $(DESTDIR)$(prefix)/include/nx
-+	$(INSTALL_DATA) libXcompshad.so.3.*     $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_DATA) *.a                     $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_DATA) *.h                     $(DESTDIR)$(prefix)/include/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)$(prefix)/lib/nx/libXcompshad.so.3.*
-+	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3
-+	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so
-+	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.a
-+	for header in *.h; do $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/$$header; done
-+	$(RM_DIR) $(DESTDIR)$(prefix)/lib/nx/
-+	$(RM_DIR) $(DESTDIR)$(prefix)/include/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
diff --git a/debian/patches/series b/debian/patches/series
index fe0a51ce0..48c294540 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,9 +10,9 @@
 009_nxproxy-add-man-page.full+lite.patch
 009_nxagent-add-man-page.full.patch
 010_nxauth_fix-binary-name-in-man-page.full.patch
-012_nxcomp_makefile-uninstall.full+lite.patch
-013_nxcompext_makefile-uninstall.full.patch
-014_nxcompshad_makefile-uninstall.full.patch
+012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
+013_nxcompext_makefile-uninstall+autoconf.full.patch
+014_nxcompshad_makefile-uninstall+autoconf.full.patch
 015_nxproxy_makefile-uninstall.full+lite.patch
 016_nx-x11_install-location.full.patch
 016_nx-X11_install-location.debian.patch