diff options
| -rw-r--r-- | config/Make.common.rules.mak | 12 | ||||
| -rw-r--r-- | cpp/Makefile.mak | 4 | ||||
| -rwxr-xr-x | cpp/config/Make.rules.mak | 8 | ||||
| -rwxr-xr-x | cpp/config/Make.rules.msvc | 12 | ||||
| -rw-r--r-- | cpp/include/Freeze/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/include/Glacier2/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/include/Ice/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/include/IceBox/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/include/IceGrid/.headers | 1 | ||||
| -rw-r--r-- | cpp/include/IceGrid/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/include/IcePatch2/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/include/IceSSL/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/include/IceStorm/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/include/Slice/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/winrt/Makefile.mak | 24 | ||||
| -rw-r--r-- | csharp/Makefile.mak | 2 | ||||
| -rw-r--r-- | php/Makefile.mak | 2 | ||||
| -rw-r--r-- | php/lib/Makefile.mak | 4 | ||||
| -rw-r--r-- | python/Makefile.mak | 2 | ||||
| -rw-r--r-- | python/python/Makefile.mak | 2 |
21 files changed, 50 insertions, 43 deletions
diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index dd5a4f915ce..0d79be448cd 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -20,6 +20,12 @@ SOVERSION = 36 OBJEXT = .obj + +# +# MKDIR +# +MKDIR = md + # # Ensure ice_language has been set by the file that includes this one. # @@ -199,19 +205,19 @@ TEXT_EXT = .txt install-common:: @if not exist "$(prefix)" \ @echo "Creating $(prefix)..." && \ - mkdir "$(prefix)" + $(MKDIR) "$(prefix)" !if "$(WINRT)" != "yes" && "$(install_slicedir)" != "" @if not exist "$(install_slicedir)" \ @echo "Creating $(install_slicedir)..." && \ - mkdir "$(install_slicedir)" && \ + $(MKDIR) "$(install_slicedir)" && \ @echo "Copying slice files..." && \ cmd /c "xcopy /s /y $(top_srcdir)\..\slice "$(install_slicedir)"" || exit 1 !endif @if not exist "$(prefix)\bin" \ @echo "Creating $(install_bindir)..." && \ - mkdir "$(prefix)\bin" + $(MKDIR) "$(prefix)\bin" @if not exist "$(prefix)\bin\icehashpassword.py" \ @copy $(top_srcdir)\..\scripts\icehashpassword.py "$(prefix)\bin"" diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak index e153ddb81aa..2d2630a169e 100644 --- a/cpp/Makefile.mak +++ b/cpp/Makefile.mak @@ -21,7 +21,7 @@ install:: install-common @for %i in ( $(INSTALL_SUBDIRS) ) do \ @if not exist %i \ @echo "Creating %i..." && \ - mkdir %i + $(MKDIR) %i @for %i in ( config src include ) do \ @echo "making $@ in %i" && \ @@ -39,7 +39,7 @@ install:: install-common @for %i in ( $(INSTALL_SUBDIRS) ) do \ @if not exist %i \ @echo "Creating %i..." && \ - mkdir %i + $(MKDIR) %i !endif $(EVERYTHING_EXCEPT_INSTALL):: diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 1a681af1388..1339d48af69 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -367,18 +367,18 @@ depend:: $(SRCS) $(OBJS_DEPEND) !endif {..}.cpp{$(DEPEND_DIR)}.d: - @if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG) + @if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG) @echo Generating dependencies for $< @$(CXX) /E /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>$(*F).d && \ cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $< $(top_srcdir) @del /q $(*F).d $(*F).i {..}.cpp{$(ARCH)\$(CONFIG)\}.obj:: - @if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG) + @if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG) $(CXX) /c /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) $< .cpp{$(OBJDIR)\}.obj:: - @if not exist "$(OBJDIR)" mkdir $(OBJDIR) + @if not exist "$(OBJDIR)" $(MKDIR) $(OBJDIR) $(CXX) /c /Fd$(OBJDIR)\ /Fo$(OBJDIR)\ $(CPPFLAGS) $(CXXFLAGS) $< {$(slicedir)\Glacier2\}.ice{Glacier2\}.d: @@ -430,7 +430,7 @@ depend:: $(SRCS) $(OBJS_DEPEND) copy $(*F).h $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR) $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR): - mkdir $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR) + $(MKDIR) $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR) all:: $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR) !endif diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index 5137a6011ba..5edd3e171f4 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -175,19 +175,19 @@ SDK_REFERENCES_PATH = $(SDK_BASE_PATH)\References\$(CONFIG)\$(ARCH) SDK_REDIST_PATH = $(SDK_BASE_PATH)\Redist\$(CONFIG)\$(ARCH) $(SDK_BASE_PATH): - mkdir $(SDK_BASE_PATH) + $(MKDIR) $(SDK_BASE_PATH) $(SDK_LIBRARY_PATH): - mkdir $(SDK_LIBRARY_PATH) + $(MKDIR) $(SDK_LIBRARY_PATH) $(SDK_REDIST_PATH): - mkdir $(SDK_REDIST_PATH) + $(MKDIR) $(SDK_REDIST_PATH) $(SDK_REFERENCES_PATH): - mkdir $(SDK_REFERENCES_PATH) + $(MKDIR) $(SDK_REFERENCES_PATH) $(SDK_INCLUDE_PATH): - mkdir $(SDK_INCLUDE_PATH) + $(MKDIR) $(SDK_INCLUDE_PATH) $(SDK_BASE_PATH)\$(SDK_MANIFEST): $(SDK_BASE_PATH) @echo <<$(SDK_MANIFEST) @@ -206,7 +206,7 @@ $(SDK_BASE_PATH)\$(SDK_MANIFEST): $(SDK_BASE_PATH) move $(SDK_MANIFEST) $(SDK_BASE_PATH) $(ARCH)\$(CONFIG): - mkdir $(ARCH)\$(CONFIG) + $(MKDIR) $(ARCH)\$(CONFIG) sdks: $(SDK_LIBRARY_PATH) $(SDK_REDIST_PATH) $(SDK_REFERENCES_PATH) $(SDK_BASE_PATH)\$(SDK_MANIFEST) \ $(SDK_INCLUDE_PATH) $(ARCH)\$(CONFIG) diff --git a/cpp/include/Freeze/Makefile.mak b/cpp/include/Freeze/Makefile.mak index 23c073f002e..050f7dd3653 100644 --- a/cpp/include/Freeze/Makefile.mak +++ b/cpp/include/Freeze/Makefile.mak @@ -14,7 +14,7 @@ top_srcdir = ..\.. install:: @if not exist "$(install_includedir)\Freeze" \ @echo "Creating $(install_includedir)\Freeze..." && \ - mkdir "$(install_includedir)\Freeze" + $(MKDIR) "$(install_includedir)\Freeze" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/include/Glacier2/Makefile.mak b/cpp/include/Glacier2/Makefile.mak index 5f57945c667..d6ed19a5afb 100644 --- a/cpp/include/Glacier2/Makefile.mak +++ b/cpp/include/Glacier2/Makefile.mak @@ -17,7 +17,7 @@ INCLUDE_DIR = Glacier2 install:: @if not exist "$(install_includedir)\Glacier2" \ @echo "Creating $(install_includedir)\Glacier2..." && \ - mkdir "$(install_includedir)\Glacier2" + $(MKDIR) "$(install_includedir)\Glacier2" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/include/Ice/Makefile.mak b/cpp/include/Ice/Makefile.mak index f6443bc3fa0..6b87b2abd74 100644 --- a/cpp/include/Ice/Makefile.mak +++ b/cpp/include/Ice/Makefile.mak @@ -17,7 +17,7 @@ INCLUDE_DIR = Ice install:: @if not exist "$(install_includedir)\Ice" \ @echo "Creating $(install_includedir)\Ice..." && \ - mkdir "$(install_includedir)\Ice" + $(MKDIR) "$(install_includedir)\Ice" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/include/IceBox/Makefile.mak b/cpp/include/IceBox/Makefile.mak index 5500e1f396a..f0978fc86f8 100644 --- a/cpp/include/IceBox/Makefile.mak +++ b/cpp/include/IceBox/Makefile.mak @@ -14,7 +14,7 @@ top_srcdir = ..\.. install:: @if not exist "$(install_includedir)\IceBox" \ @echo "Creating $(install_includedir)\IceBox..." && \ - mkdir "$(install_includedir)\IceBox" + $(MKDIR) "$(install_includedir)\IceBox" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/include/IceGrid/.headers b/cpp/include/IceGrid/.headers index 973e1bf0a8f..9a7b96a4cbf 100644 --- a/cpp/include/IceGrid/.headers +++ b/cpp/include/IceGrid/.headers @@ -7,6 +7,7 @@ SDK_HEADERS = \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IceGrid.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Locator.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Observer.h \ + $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\PluginFacade.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Query.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Registry.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ReplicaGroupFilter.h \ diff --git a/cpp/include/IceGrid/Makefile.mak b/cpp/include/IceGrid/Makefile.mak index 8fb9e137e76..0870c74a586 100644 --- a/cpp/include/IceGrid/Makefile.mak +++ b/cpp/include/IceGrid/Makefile.mak @@ -17,7 +17,7 @@ INCLUDE_DIR = IceGrid install:: @if not exist "$(install_includedir)\IceGrid" \ @echo "Creating $(install_includedir)\IceGrid..." && \ - mkdir "$(install_includedir)\IceGrid" + $(MKDIR) "$(install_includedir)\IceGrid" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/include/IcePatch2/Makefile.mak b/cpp/include/IcePatch2/Makefile.mak index fc9792ef105..528e8e74b4e 100644 --- a/cpp/include/IcePatch2/Makefile.mak +++ b/cpp/include/IcePatch2/Makefile.mak @@ -14,7 +14,7 @@ top_srcdir = ..\.. install:: @if not exist "$(install_includedir)\IcePatch2" \ @echo "Creating $(install_includedir)\IcePatch2..." && \ - mkdir "$(install_includedir)\IcePatch2" + $(MKDIR) "$(install_includedir)\IcePatch2" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/include/IceSSL/Makefile.mak b/cpp/include/IceSSL/Makefile.mak index 07028a332c1..f9081d9abd8 100644 --- a/cpp/include/IceSSL/Makefile.mak +++ b/cpp/include/IceSSL/Makefile.mak @@ -17,7 +17,7 @@ INCLUDE_DIR = IceSSL install:: @if not exist "$(install_includedir)\IceSSL" \ @echo "Creating $(install_includedir)\IceSSL..." && \ - mkdir "$(install_includedir)\IceSSL" + $(MKDIR) "$(install_includedir)\IceSSL" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/include/IceStorm/Makefile.mak b/cpp/include/IceStorm/Makefile.mak index 91888169e6b..888e5500e59 100644 --- a/cpp/include/IceStorm/Makefile.mak +++ b/cpp/include/IceStorm/Makefile.mak @@ -17,7 +17,7 @@ INCLUDE_DIR = IceStorm install:: @if not exist "$(install_includedir)\IceStorm" \ @echo "Creating $(install_includedir)\IceStorm..." && \ - mkdir "$(install_includedir)\IceStorm" + $(MKDIR) "$(install_includedir)\IceStorm" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/include/IceUtil/Makefile.mak b/cpp/include/IceUtil/Makefile.mak index f1a63f3143a..6e0e6ba0d6e 100644 --- a/cpp/include/IceUtil/Makefile.mak +++ b/cpp/include/IceUtil/Makefile.mak @@ -16,7 +16,7 @@ INCLUDE_DIR = IceUtil install:: @if not exist "$(install_includedir)\IceUtil" \ @echo "Creating $(install_includedir)\IceUtil..." && \ - mkdir "$(install_includedir)\IceUtil" + $(MKDIR) "$(install_includedir)\IceUtil" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/include/Slice/Makefile.mak b/cpp/include/Slice/Makefile.mak index f01c12a993d..30f24a1ff7e 100644 --- a/cpp/include/Slice/Makefile.mak +++ b/cpp/include/Slice/Makefile.mak @@ -14,7 +14,7 @@ top_srcdir = ..\.. install:: @if not exist "$(install_includedir)\Slice" \ @echo "Creating $(install_includedir)\Slice..." && \ - mkdir "$(install_includedir)\Slice" + $(MKDIR) "$(install_includedir)\Slice" @for %i in ( *.h ) do \ @echo Installing %i && \ diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak index c0d326d234c..df53cc3e0dd 100644 --- a/cpp/src/Ice/winrt/Makefile.mak +++ b/cpp/src/Ice/winrt/Makefile.mak @@ -226,30 +226,30 @@ $(LIBNAME): $(LOCAL_OBJS) $(OBJS) sdks $(AR) $(ARFLAGS) $(OBJS) $(LOCAL_OBJS) /out:$(LIBNAME) .cpp.d: - @if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG) + @if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG) @echo Generating dependencies for $< @$(CXX) /E /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>$(*F).d && \ cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $(*F).cpp $(top_srcdir) @del /q $(*F).d $(*F).i .cpp{$(ARCH)\$(CONFIG)\}.obj:: - @if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG) + @if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG) $(CXX) /c /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) $< .cpp{$(ARCH)\$(CONFIG)\IceDiscovery\}.obj:: - @if not exist "$(ARCH)\$(CONFIG)\IceDiscovery" mkdir $(ARCH)\$(CONFIG)\IceDiscovery + @if not exist "$(ARCH)\$(CONFIG)\IceDiscovery" $(MKDIR) $(ARCH)\$(CONFIG)\IceDiscovery $(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $< .cpp{$(ARCH)\$(CONFIG)\IceLocatorDiscovery\}.obj:: - @if not exist "$(ARCH)\$(CONFIG)\IceLocatorDiscovery" mkdir $(ARCH)\$(CONFIG)\IceLocatorDiscovery + @if not exist "$(ARCH)\$(CONFIG)\IceLocatorDiscovery" $(MKDIR) $(ARCH)\$(CONFIG)\IceLocatorDiscovery $(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceLocatorDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $< {..\..\IceDiscovery\}.cpp{$(ARCH)\$(CONFIG)\IceDiscovery\}.obj:: - @if not exist "$(ARCH)\$(CONFIG)\IceDiscovery" mkdir $(ARCH)\$(CONFIG)\IceDiscovery + @if not exist "$(ARCH)\$(CONFIG)\IceDiscovery" $(MKDIR) $(ARCH)\$(CONFIG)\IceDiscovery $(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $< {..\..\IceLocatorDiscovery\}.cpp{$(ARCH)\$(CONFIG)\IceLocatorDiscovery\}.obj:: - @if not exist "$(ARCH)\$(CONFIG)\IceLocatorDiscovery" mkdir $(ARCH)\$(CONFIG)\IceLocatorDiscovery + @if not exist "$(ARCH)\$(CONFIG)\IceLocatorDiscovery" $(MKDIR) $(ARCH)\$(CONFIG)\IceLocatorDiscovery $(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceLocatorDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $< .cpp{$(DEPEND_DIR)\IceDiscovery\}.d: @@ -265,14 +265,14 @@ $(LIBNAME): $(LOCAL_OBJS) $(OBJS) sdks @del /q $(*F).d $(*F).i {..\..\IceDiscovery\}.cpp{$(DEPEND_DIR)\IceDiscovery\}.d: - @if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG) + @if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG) @echo Generating dependencies for $< @$(CXX) /E /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>IceDiscovery\$(*F).d && \ cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $< $(top_srcdir) @del /q $(*F).d $(*F).i {..\..\IceLocatorDiscovery\}.cpp{$(DEPEND_DIR)\IceLocatorDiscovery\}.d: - @if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG) + @if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG) @echo Generating dependencies for $< @$(CXX) /E /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>IceLocatorDiscovery\$(*F).d && \ cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $< $(top_srcdir) @@ -316,13 +316,13 @@ $(LIBNAME): $(LOCAL_OBJS) $(OBJS) sdks cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice "..\" {$(slicedir)\IceDiscovery}.ice.cpp: - @if not exist "IceDiscovery" mkdir IceDiscovery + @if not exist "IceDiscovery" $(MKDIR) IceDiscovery del /q IceDiscovery\$(*F).h $(*F).cpp "$(SLICE2CPP)" --include-dir IceDiscovery $(SLICE2CPPFLAGS) $< move $(*F).h IceDiscovery {$(slicedir)\IceDiscovery}.ice{IceDiscovery}.h: - @if not exist "IceDiscovery" mkdir IceDiscovery + @if not exist "IceDiscovery" $(MKDIR) IceDiscovery del /q IceDiscovery\$(*F).h $(*F).cpp "$(SLICE2CPP)" --include-dir IceDiscovery $(SLICE2CPPFLAGS) $< move $(*F).h IceDiscovery @@ -333,13 +333,13 @@ $(LIBNAME): $(LOCAL_OBJS) $(OBJS) sdks cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice "..\" {$(slicedir)\IceLocatorDiscovery}.ice.cpp: - @if not exist "IceLocatorDiscovery" mkdir IceLocatorDiscovery + @if not exist "IceLocatorDiscovery" $(MKDIR) IceLocatorDiscovery del /q IceLocatorDiscovery\$(*F).h $(*F).cpp "$(SLICE2CPP)" --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS) $< move $(*F).h IceLocatorDiscovery {$(slicedir)\IceLocatorDiscovery}.ice{IceLocatorDiscovery}.h: - @if not exist "IceLocatorDiscovery" mkdir IceLocatorDiscovery + @if not exist "IceLocatorDiscovery" $(MKDIR) IceLocatorDiscovery del /q IceLocatorDiscovery\$(*F).h $(*F).cpp "$(SLICE2CPP)" --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS) $< move $(*F).h IceLocatorDiscovery diff --git a/csharp/Makefile.mak b/csharp/Makefile.mak index 6c94240fad3..9e9b0ff753a 100644 --- a/csharp/Makefile.mak +++ b/csharp/Makefile.mak @@ -19,7 +19,7 @@ install:: install-common @for %i in ( $(INSTALL_SUBDIRS) ) do \ @if not exist %i \ @echo "Creating %i..." && \ - mkdir %i + $(MKDIR) %i $(EVERYTHING_EXCEPT_INSTALL):: @for %i in ( $(SUBDIRS) ) do \ diff --git a/php/Makefile.mak b/php/Makefile.mak index b36988ca1c5..9efe9bdf02e 100644 --- a/php/Makefile.mak +++ b/php/Makefile.mak @@ -16,7 +16,7 @@ SUBDIRS = src lib test install:: install-common @if not exist "$(install_libdir)" \ @echo "Creating $(install_libdir)..." && \ - mkdir "$(install_libdir)" + $(MKDIR) "$(install_libdir)" $(EVERYTHING_EXCEPT_INSTALL):: @for %i in ( $(SUBDIRS) ) do \ diff --git a/php/lib/Makefile.mak b/php/lib/Makefile.mak index d121f60603e..4f6adafafc2 100644 --- a/php/lib/Makefile.mak +++ b/php/lib/Makefile.mak @@ -113,7 +113,7 @@ SLICE2PHPFLAGS = $(SLICE2PHPFLAGS) --ice all:: $(ALL_SRCS) $(MODULES): - -mkdir $@ + -$(MKDIR) $@ $(ALL_SRCS): $(MODULES) {$(slicedir)}$*.ice "$(SLICE2PHP)" "$(SLICEPARSERLIB)" -"$(SLICE2PHP)" $(SLICE2PHPFLAGS) --output-dir $(*D) "$(slicedir)\$*.ice" @@ -154,7 +154,7 @@ install:: $(ALL_SRCS) @echo "Installing generated code" @for %i in ( $(MODULES) ) do \ @if not exist "$(install_phpdir)\%i" \ - mkdir "$(install_phpdir)\%i" + $(MKDIR) "$(install_phpdir)\%i" @for %i in ( $(MODULES) ) do \ copy %i\* "$(install_phpdir)\%i" @for %i in ( $(MODULE_SRCS) ) do \ diff --git a/python/Makefile.mak b/python/Makefile.mak index 052d2a10cf8..60d92e557a7 100644 --- a/python/Makefile.mak +++ b/python/Makefile.mak @@ -16,7 +16,7 @@ SUBDIRS = modules python test install:: install-common @if not exist "$(install_pythondir)" \ @echo "Creating $(install_pythondir)..." && \ - mkdir "$(install_pythondir)" + $(MKDIR) "$(install_pythondir)" $(EVERYTHING_EXCEPT_INSTALL):: @for %i in ( $(SUBDIRS) ) do \ diff --git a/python/python/Makefile.mak b/python/python/Makefile.mak index 13e4df20f60..8ed64078b9a 100644 --- a/python/python/Makefile.mak +++ b/python/python/Makefile.mak @@ -347,7 +347,7 @@ install:: $(ALL_SRCS) copy *.py "$(install_pythondir)" @for %i in ( $(PACKAGES) ) do \ @if not exist "$(install_pythondir)\%i" \ - mkdir "$(install_pythondir)\%i" + $(MKDIR) "$(install_pythondir)\%i" @for %i in ( $(PACKAGES) ) do \ copy %i\* "$(install_pythondir)\%i" |