- Fix slicedir macro so it will work if you are using ICE_HOME in a

source distribution or repository.
- Fixup vb make.rules.mak

5 files changed, 35 insertions, 10 deletions

diff --git a/cs/config/Make.rules.mak.cs b/cs/config/Make.rules.mak.cs
index 229c9e90079..cfdc966740e 100644
--- a/cs/config/Make.rules.mak.cs
+++ b/cs/config/Make.rules.mak.cs
@@ -57,7 +57,12 @@ libdir			= $(top_srcdir)\lib
 #
 # If a slice directory is contained along with this distribution -- use it. 
 #
+
+!if exist("$(ICE_DIR)\slice")
 slicedir 		= $(ICE_DIR)\slice
+!else
+slicedir                = $(ICE_DIR)\..\slice
+!endif
 
 install_bindir		= $(prefix)\bin
 install_libdir		= $(prefix)\lib
diff --git a/php/config/Make.rules.mak b/php/config/Make.rules.mak
index 6f6af051e4c..97b6c9ab998 100644
--- a/php/config/Make.rules.mak
+++ b/php/config/Make.rules.mak
@@ -56,7 +56,11 @@ SOVERSION		= 33
 bindir			= $(top_srcdir)\bin
 libdir			= $(top_srcdir)\lib
 
-slicedir		= $(ICE_DIR)\slice
+!if exist ("$(ICE_DIR)\slice")
+slicedir 		= $(ICE_DIR)\slice
+!else
+slicedir                = $(ICE_DIR)\..\slice
+!endif
 
 install_libdir		= $(prefix)\bin
 install_libdir		= $(prefix)\lib
diff --git a/py/config/Make.rules.mak b/py/config/Make.rules.mak
index 66951e90536..3e715bb05c8 100644
--- a/py/config/Make.rules.mak
+++ b/py/config/Make.rules.mak
@@ -106,7 +106,11 @@ ICE_CPPFLAGS		= -I"$(ICE_DIR)\include"
 ICE_LDFLAGS		= /LIBPATH:"$(ICE_DIR)\lib"
 !endif
 
-slicedir		= $(ICE_DIR)\slice
+!if exist ("$(ICE_DIR)\slice")
+slicedir 		= $(ICE_DIR)\slice
+!else
+slicedir                = $(ICE_DIR)\..\slice
+!endif
 
 PYTHON_CPPFLAGS		= -I"$(PYTHON_HOME)\include"
 PYTHON_LDFLAGS		= /LIBPATH:"$(PYTHON_HOME)\libs"
diff --git a/rb/config/Make.rules.mak b/rb/config/Make.rules.mak
index 2d3f8ff4224..ce28b24ea46 100644
--- a/rb/config/Make.rules.mak
+++ b/rb/config/Make.rules.mak
@@ -87,7 +87,11 @@ ICE_CPPFLAGS		= -I"$(ICE_DIR)\include"
 ICE_LDFLAGS		= /LIBPATH:"$(ICE_DIR)\lib"
 !endif
 
-slicedir		= $(ICE_DIR)\slice
+!if exist ("$(ICE_DIR)\slice")
+slicedir 		= $(ICE_DIR)\slice
+!else
+slicedir                = $(ICE_DIR)\..\slice
+!endif
 
 RUBY_CPPFLAGS		= -I"$(RUBY_HOME)\lib\ruby\1.8\i386-mswin32"
 RUBY_LDFLAGS		= /LIBPATH:"$(RUBY_HOME)\lib"
diff --git a/vb/config/Make.rules.mak.vb b/vb/config/Make.rules.mak.vb
index 5c932857fa7..017bdfcdcc4 100644
--- a/vb/config/Make.rules.mak.vb
+++ b/vb/config/Make.rules.mak.vb
@@ -8,7 +8,10 @@
 # **********************************************************************
 
 !if "$(ICE_HOME)" == ""
-!error ICE_HOME is not defined
+ICE_DIR		= $(top_srcdir)\..
+USE_SRC_DIR	= 1
+!else
+ICE_DIR 	= $(ICE_HOME)
 !endif
 
 #
@@ -34,8 +37,8 @@ VERSION			= 3.3.0
 bindir			= $(top_srcdir)\bin
 libdir			= $(top_srcdir)\lib
 
-!if exist ($(ICE_HOME)\bin\icecs.dll)
-csbindir	 	= $(ICE_HOME)\bin
+!if exist ("$(ICE_DIR)\bin\icecs.dll")
+csbindir	 	= $(ICE_DIR)\bin
 !else
 csbindir 		= $(top_srcdir)\..\cs\bin
 !endif
@@ -44,10 +47,11 @@ csbindir 		= $(top_srcdir)\..\cs\bin
 # If a slice directory is contained along with this distribution -- use it. 
 # Otherwise use paths relative to $(ICE_HOME).
 #
-!if exist ($(top_srcdir)\slice)
-slicedir 		= $(top_srcdir)\slice
+
+!if exist ("$(ICE_DIR)\slice")
+slicedir 		= $(ICE_DIR)\slice
 !else
-slicedir 		= $(ICE_HOME)\slice
+slicedir                = $(ICE_DIR)\..\slice
 !endif
 
 VBC			= vbc -nologo /r:system.dll
@@ -68,7 +72,11 @@ MCSFLAGS 		= $(MCSFLAGS) -debug -define:DEBUG
 MCSFLAGS 		= $(MCSFLAGS) -optimize+
 !endif
 
-SLICE2CS		= "$(ICE_HOME)\bin\slice2cs"
+!if "$(USE_SRC_DIR)" == "1"
+SLICE2CS		= "$(ICE_DIR)\cpp\bin\slice2cs.exe"
+!else
+SLICE2CS		= "$(ICE_DIR)\bin\slice2cs.exe"
+!endif
 
 EVERYTHING		= all clean depend config