fix for bug 475: removing IcePack

3 files changed, 4 insertions, 4 deletions

diff --git a/cpp/makebindist.py b/cpp/makebindist.py
index acf0fa07e16..9ca83bc6256 100755
--- a/cpp/makebindist.py
+++ b/cpp/makebindist.py
@@ -196,7 +196,7 @@ else
     ICE_DIR = $(ICE_HOME)
 endif
 
-ifneq ($(shell test -f $(ICE_DIR)/bin/icepackadmin && echo 0),0)
+ifneq ($(shell test -f $(ICE_DIR)/bin/icestormadmin && echo 0),0)
     $(error Ice distribution not found, please set ICE_HOME!)
 endif
 """
diff --git a/cpp/slice/Ice/Properties.ice b/cpp/slice/Ice/Properties.ice
index cd38e2b0bff..5dd7689eaf0 100644
--- a/cpp/slice/Ice/Properties.ice
+++ b/cpp/slice/Ice/Properties.ice
@@ -158,8 +158,9 @@ local interface Properties
      *
      * Convert a sequence of command-line options into properties.
      * All options that begin with one of the following prefixes
-     * are converted into properties: [--Ice], [--IceBox], [--IcePack],
-     * [--IcePatch], [--IceSSL], [--IceStorm], [--Freeze], and [--Glacier].
+     * are converted into properties: [--Ice], [--IceBox], [--IceGrid],
+     * [--IcePatch], [--IcePatch2], [--IceSSL], [--IceStorm], [--Freeze],
+     * [--Glacier], and [--Glacier2].
      *
      * @param options The command-line options.
      *
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index fc3f9a7fd0c..1fa9015d24a 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -203,7 +203,6 @@ Ice::PropertiesI::parseIceCommandLineOptions(const StringSeq& options)
     args = parseCommandLineOptions("Glacier", args);
     args = parseCommandLineOptions("Glacier2", args);
     args = parseCommandLineOptions("IceBox", args);
-    args = parseCommandLineOptions("IcePack", args);
     args = parseCommandLineOptions("IcePatch", args);
     args = parseCommandLineOptions("IcePatch2", args);
     args = parseCommandLineOptions("IceStorm", args);