From 55ebd56b0870d3260a34e6645fa4ec1c7c9ab237 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Mon, 25 May 2015 18:36:03 +0200
Subject: [PATCH] Fix "make distcheck" with regard to OBJDIR

---
 src/makefile.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/makefile.c b/src/makefile.c
index 619157c..3b5dbee 100644
--- a/src/makefile.c
+++ b/src/makefile.c
@@ -2703,9 +2703,12 @@ static int _makefile_remove(FILE * fp, int recursive, ...)
 static int _makefile_subdirs(FILE * fp, char const * target)
 {
 	if(target != NULL)
-		_makefile_print(fp, "\t@for i in $(SUBDIRS); do"
-				" (cd \"$$i\" && $(MAKE) %s) || exit; done\n",
-				target);
+		_makefile_print(fp,
+				"\t@for i in $(SUBDIRS); do (cd \"$$i\" && \\\n"
+				"\t\tif [ -n \"$(OBJDIR)\" ]; then \\\n"
+				"\t\t$(MAKE) OBJDIR=\"$(OBJDIR)$$i/\" %s; \\\n"
+				"\t\telse $(MAKE) %s; fi) || exit; done\n",
+				target, target);
 	else
 		_makefile_print(fp, "%s",
 				"\t@for i in $(SUBDIRS); do (cd \"$$i\" && \\\n"