[pkg-remote-commits] [nx-libs] 01/01: debian/patches: Add 0006_fix-duplicate-build-attempt-in-main-Makefile.patch. On 'make all', don't call the subfolders' 'build' rules via the '%:' ruleset.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository nx-libs.

commit 5fd06e943d2b371d86efb36609e135689deeeac3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 13 16:16:43 2017 +0200

    debian/patches: Add 0006_fix-duplicate-build-attempt-in-main-Makefile.patch. On 'make all', don't call the subfolders' 'build' rules via the '%:' ruleset.
---
 ...-duplicate-build-attempt-in-main-Makefile.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/0006_fix-duplicate-build-attempt-in-main-Makefile.patch b/debian/patches/0006_fix-duplicate-build-attempt-in-main-Makefile.patch
new file mode 100644
index 0000000..4f758ac
--- /dev/null
+++ b/debian/patches/0006_fix-duplicate-build-attempt-in-main-Makefile.patch
@@ -0,0 +1,27 @@
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Description: On 'make all', don't call the subfolders' 'build' rules via the '%:' ruleset.
+
+index 8ea31cd..dedbe21 100644
+--- a/Makefile
++++ b/Makefile
+@@ -38,16 +38,18 @@
+ 	    if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \
+ 	fi
+ 
+-	# clean auto-generated nxversion.def file \
++	# clean auto-generated files
+ 	if [ "x$@" == "xclean" ] || [ "x$@" = "xdistclean" ]; then \
+ 	    ./mesa-quilt pop -a; \
+ 	    rm -Rf nx-X11/extras/Mesa/.pc/; \
++	    rm -f nx-X11/config/cf/date.def; \
+ 	    rm -f nx-X11/config/cf/nxversion.def; \
+ 	    rm -f bin/nxagent; \
+ 	    rm -f bin/nxproxy; \
+ 	fi
+ 
+-all: build
++all:
++	${MAKE} build
+ 
+ test:
+ 	echo "No testing for NX (redistributed)"
diff --git a/debian/patches/series b/debian/patches/series
index 7a95108..0ef1616 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,6 @@
 0003_define-EBADFD-if-undefined.patch
 0004_nx-X11-gnu-hurd-support.patch
 0005_define-USE_IEEE-macro-for-more-platforms.patch
+0006_fix-duplicate-build-attempt-in-main-Makefile.patch
 2001_nx-X11_install-location.debian.patch
 2002_xserver-xext_set-securitypolicy-path.debian.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/nx-libs.git