Adapted to jre1.5 and apache2

src/tools/pkg/deb/pwr/pwrp_profile

@@ -30,7 +30,8 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-export jdk_home=/usr/local/jdk1.3/bin
+jdk=`eval ls /usr/local | grep ^jre`
+export jdk_home=/usr/local/$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 
 #Set display to remote computer

src/tools/pkg/deb/pwrrt/postinst

@@ -231,9 +231,9 @@ fi
 #
 # Add proview web directories to Apache
 #
-if [ -e /etc/apache/httpd.conf ]; then
-  if ! egrep -q "Alias[ ]+/pwrp_web/" /etc/apache/httpd.conf; then
-    cat >> /etc/apache/httpd.conf <<-EOF
+if [ -e /etc/apache2/apache2.conf ]; then
+  if ! egrep -q "Alias[ ]+/pwrp_web/" /etc/apache2/apache2.conf; then
+    cat >> /etc/apache2/apache2.conf <<-EOF
 
 	#
 	# Proview alias pwrp_web, added by Proview installation

src/tools/pkg/deb/pwrrt/pwrp_profile

@@ -30,7 +30,7 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls /usr/local | grep j2re`
+jdk=`eval ls /usr/local | grep ^jre`
 export jdk_home=/usr/local/$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/rpm/pwr/pwrp_profile

@@ -30,7 +30,8 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-export jdk_home=/usr/local/jdk1.3/bin
+jdk=`eval ls /usr/local | grep ^jre`
+export jdk_home=/usr/local/$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 
 #Set display to remote computer

src/tools/pkg/rpm/pwrrt/pwrp_profile

@@ -30,7 +30,7 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls /usr/local | grep j2re`
+jdk=`eval ls /usr/local | grep ^jre`
 export jdk_home=/usr/local/$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/rpm/pwrrt/pwrrt.spec

@@ -265,9 +265,9 @@ fi
 #
 # Add proview web directories to Apache
 #
-if [ -e /etc/apache/httpd.conf ]; then
-  if ! egrep -q "Alias[ ]+/pwrp_web/" /etc/apache/httpd.conf; then
-    cat >> /etc/apache/httpd.conf <<-EOF
+if [ -e /etc/apache2/apache2.conf ]; then
+  if ! egrep -q "Alias[ ]+/pwrp_web/" /etc/apache2/apache2.conf; then
+    cat >> /etc/apache2/apache2.conf <<-EOF
 
 	#
 	# Proview alias pwrp_web, added by Proview installation