summaryrefslogtreecommitdiff
path: root/Makefile.win
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2011-12-27 19:42:47 +0100
committerStefan Fritsch <sf@sfritsch.de>2011-12-27 19:42:47 +0100
commitd9f98b967bedecc0bffe82682d1ed4e06c9df687 (patch)
tree0f252658cdeaca951fc4214634bc45392aba41d2 /Makefile.win
parent6a3ba4eb1e9c7d7e07529543117d79ac01af20f5 (diff)
downloadapache2-d9f98b967bedecc0bffe82682d1ed4e06c9df687.tar.gz
Upstream tarball 2.2.14upstream/2.2.14
Diffstat (limited to 'Makefile.win')
-rw-r--r--Makefile.win14
1 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.win b/Makefile.win
index 7faba4b1..5dbb85a3 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
@@ -623,10 +623,6 @@ _install:
-mkdir "$(INSTDIR)\lib"
-mkdir "$(INSTDIR)\logs"
-mkdir "$(INSTDIR)\modules"
- -mkdir "$(INSTDIR)\symbols"
- -mkdir "$(INSTDIR)\symbols\exe"
- -mkdir "$(INSTDIR)\symbols\dll"
- -mkdir "$(INSTDIR)\symbols\so"
copy ABOUT_APACHE "$(INSTDIR)\ABOUT_APACHE.txt" <.y
copy CHANGES "$(INSTDIR)\CHANGES.txt" <.y
copy INSTALL "$(INSTDIR)\INSTALL.txt" <.y