From: Tom Fogal <tfogal@alumni.unh.edu>
Date: Tue, 13 Oct 2009 17:55:34 +0000 (-0700)
Subject: Fix build when PROGRAM_DIRS is empty.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=115edf24a9128b79dfa5f30482c990e2cb898357;p=mesa.git

Fix build when PROGRAM_DIRS is empty.

SUBDIRS just takes PROGRAM_DIRS value.  If PROGRAM_DIRS gets set
to the empty string (as can happen when building only OSMesa), a
'for' loop will lack anything to iterate over, causing a parse
error.

This fixes the issue by making sure SUBDIRS is the null string
when PROGRAM_DIRS is, and wrapping the for loops in if's, causing
them only to execute if there are directories to iterate over.
---

diff --git a/progs/Makefile b/progs/Makefile
index c99f4eebcc1..064e5a232ee 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -4,7 +4,7 @@ TOP = ..
 
 include $(TOP)/configs/current
 
-SUBDIRS = $(PROGRAM_DIRS)
+SUBDIRS ="$(PROGRAM_DIRS)"
 
 
 default: message subdirs
@@ -15,18 +15,22 @@ message:
 
 
 subdirs:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE)) || exit 1 ; \
-		fi \
-	done
+	@if test -n "$(SUBDIRS)" ; then \
+		for dir in $(SUBDIRS) ; do \
+			if [ -d $$dir ] ; then \
+				(cd $$dir && $(MAKE)) || exit 1 ; \
+			fi \
+		done \
+	fi
 
 # Dummy install target
 install:
 
 clean:
-	-@for dir in $(SUBDIRS) tests ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) clean) ; \
-		fi \
-	done
+	-@if test -n "$(SUBDIRS)" ; then \
+		for dir in $(SUBDIRS) tests ; do \
+			if [ -d $$dir ] ; then \
+				(cd $$dir && $(MAKE) clean) ; \
+			fi \
+		done \
+	fi