Fixed bug 1437, 1239

6 files changed, 16 insertions, 15 deletions

diff --git a/cpp/config/upgradeicegrid.py b/cpp/config/upgradeicegrid.py
index 57bd3a88d66..8ea4ab3e63b 100755
--- a/cpp/config/upgradeicegrid.py
+++ b/cpp/config/upgradeicegrid.py
@@ -111,7 +111,7 @@ for bindir in [os.path.join(icedir, "bin"), "/usr/bin"]:
 else:
     raise "can't locate the `transformdb' executable"
 
-for slicedir in [os.path.join(icedir, "slice"), "/usr/share"]:
+for slicedir in [os.path.join(icedir, "slice"), "/usr/share/slice"]:
     slicedir = os.path.normpath(slicedir)
     if os.path.exists(os.path.join(slicedir, "IceGrid", "Admin.ice")):
         break
diff --git a/cpp/install/unix/SOURCES.AIX b/cpp/install/unix/SOURCES.AIX
index d4d72fd0cf2..5ebce513d21 100644
--- a/cpp/install/unix/SOURCES.AIX
+++ b/cpp/install/unix/SOURCES.AIX
@@ -1,6 +1,6 @@
 Source Code
 -----------
 
-The source distributions of Ice and Berkeley DB used to build this 
-distribution can be downloaded at no cost from 
-http://www.zeroc.com/download.html.
+The source distributions of Ice, Berkeley DB, JGoodies Forms and
+JGoodies Looks used to build this distribution can be downloaded at no
+cost from http://www.zeroc.com/download.html.
diff --git a/cpp/install/unix/SOURCES.Darwin b/cpp/install/unix/SOURCES.Darwin
index cfcd4774454..3ea0f33988f 100644
--- a/cpp/install/unix/SOURCES.Darwin
+++ b/cpp/install/unix/SOURCES.Darwin
@@ -1,6 +1,6 @@
 Source Code
 -----------
 
-The source distributions of Ice, Berkeley DB and Expat used to build 
-this distribution can be downloaded at no cost from 
-http://www.zeroc.com/download.html.
+The source distributions of Ice, Berkeley DB, Expat, JGoodies Forms
+and JGoodies Looks used to build this distribution can be downloaded
+at no cost from http://www.zeroc.com/download.html.
diff --git a/cpp/install/unix/SOURCES.HP-UX b/cpp/install/unix/SOURCES.HP-UX
index 2739e0039b9..b7f05a79208 100644
--- a/cpp/install/unix/SOURCES.HP-UX
+++ b/cpp/install/unix/SOURCES.HP-UX
@@ -1,6 +1,6 @@
 Source Code
 -----------
 
-The source distributions of Ice, Berkeley DB and OpenSSL used to build this 
-distribution can be downloaded at no cost from 
-http://www.zeroc.com/download.html.
+The source distributions of Ice, Berkeley DB, OpenSSL, JGoodies Forms
+and JGoodies Looks used to build this distribution can be downloaded
+at no cost from http://www.zeroc.com/download.html.
diff --git a/cpp/install/unix/SOURCES.Linux b/cpp/install/unix/SOURCES.Linux
index cd2db4611c1..adfaad2bb05 100644
--- a/cpp/install/unix/SOURCES.Linux
+++ b/cpp/install/unix/SOURCES.Linux
@@ -1,5 +1,6 @@
 Source Code
 -----------
 
-The source distributions of Ice used to build this distribution can be
-downloaded at no cost from http://www.zeroc.com/download.html.
+The source distributions of Ice, JGoodies Forms and JGoodies Looks
+used to build this distribution can be downloaded at no cost from
+http://www.zeroc.com/download.html.
diff --git a/cpp/install/unix/SOURCES.SunOS b/cpp/install/unix/SOURCES.SunOS
index d4d72fd0cf2..5ebce513d21 100644
--- a/cpp/install/unix/SOURCES.SunOS
+++ b/cpp/install/unix/SOURCES.SunOS
@@ -1,6 +1,6 @@
 Source Code
 -----------
 
-The source distributions of Ice and Berkeley DB used to build this 
-distribution can be downloaded at no cost from 
-http://www.zeroc.com/download.html.
+The source distributions of Ice, Berkeley DB, JGoodies Forms and
+JGoodies Looks used to build this distribution can be downloaded at no
+cost from http://www.zeroc.com/download.html.