From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 11 Aug 2009 15:30:38 +0000 (+0000)
Subject: Work around an empty DBM_LIST, backports r803159
X-Git-Tag: 2.2.14~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af3a5112a62c4b835388de1248af3c3762f31eb2;p=thirdparty%2Fapache%2Fhttpd.git

Work around an empty DBM_LIST, backports r803159

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@803161 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.win b/Makefile.win
index 7faba4b1b47..01b14a437f1 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -142,19 +142,19 @@ _trydb:
 	for %d in (odbc $(DBD_LIST)) do \
 	  $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\dbm
-	for %d in ($(DBM_LIST)) do \
+	for %d in ($(DBM_LIST) x) do if not %d == x \
 	  $(MAKE) $(MAKEOPT) -f apr_dbm_%d.mak CFG="apr_dbm_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..\..
 !ELSEIF $(USESLN) == 1
 	for %d in (odbc $(DBD_LIST)) do \
 	  devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d
-	for %d in ($(DBM_LIST)) do \
+	for %d in ($(DBM_LIST) x) do if not %d == x \
 	  devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbm_%d
 !ELSE
 	@for %d in (odbc $(DBD_LIST)) do \
 	  msdev Apache.dsw /USEENV /MAKE \
 		"apr_dbd_%d - Win32 $(LONG)" /NORECURSE $(CTARGET)
-	@for %d in ($(DBM_LIST)) do \
+	@for %d in ($(DBM_LIST) x) do if not %d == x \
 	  msdev Apache.dsw /USEENV /MAKE \
 		"apr_dbm_%d - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
@@ -274,7 +274,7 @@ _build:
 	    $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak   CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..
 	cd dbm
-	  for %d in ($(DBM_LIST)) do \
+	  for %d in ($(DBM_LIST) x) do if not %d == x \
 	    $(MAKE) $(MAKEOPT) -f apr_dbm_%d.mak   CFG="apr_dbm_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..
 	cd ..\..
@@ -495,7 +495,7 @@ _copybin:
 	for %d in (odbc $(DBD_LIST)) do ( \
 	  copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \
 	)
-	for %d in ($(DBM_LIST)) do ( \
+	for %d in ($(DBM_LIST) x) do if not %d == x ( \
 	  copy srclib\apr-util\dbm\$(LONG)\apr_dbm_%d-1.$(src_dll) "$(inst_dll)" <.y \
 	)
 	copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) 	"$(inst_so)" <.y