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.
---
 progs/Makefile |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/progs/Makefile b/progs/Makefile
index c99f4ee..064e5a2 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
-- 
1.6.3.3


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev

Reply via email to