--- install.orig	Sat Oct 23 07:22:23 1999
+++ install	Fri Sep  7 09:05:47 2001
@@ -11,13 +11,13 @@
 
 $APP = 'Ricochet'; 
 $VERSION = '0.92';
-$DIR = "$ENV{HOME}/.ricochet"; 
+$DIR = "%%PREFIX%%/share/ricochet";
 @PACKAGE = qw/TODO CHANGES README ARTISTIC complaint-template ricochet abuse-contacts/; 
 
 @REQUIRED = qw /Mail::Internet Net::DNS Text::Template Net::XWhois LWP::UserAgent/;  
 
-$BINDIR = '/usr/local/bin'; 
+$BINDIR = '%%PREFIX%%/bin'; 
-$EMAIL = defined $ENV{EMAIL} ? $ENV{EMAIL} : "$ENV{USERNAME}\@$ENV{HOSTNAME}";
+$EMAIL = defined $ENV{EMAIL} ? $ENV{EMAIL} : "$ENV{USER}\@$ENV{HOST}";
 
 ## Print an intro message.
 print "\n---== $APP $VERSION Install ==---\n\n"; 
@@ -89,25 +89,25 @@
 }
 
 ## Take config params: 
-&take_input ("Where should I place the Ricochet executable [Default: $BINDIR]?", \$BINDIR); 
-&take_input ("Return email address for complaint mails [Default: $EMAIL]?", \$EMAIL);  
+#&take_input ("Where should I place the Ricochet executable [Default: $BINDIR]?", \$BINDIR); 
+#&take_input ("Return email address for complaint mails [Default: $EMAIL]?", \$EMAIL);  
 
 ## Make $HOME/.ricochet 
 unless (-e $DIR) { 
     print "\nMaking $DIR...\n"; 
-    mkdir $DIR, 0700; 
+    mkdir $DIR, 0755; 
 }
 print "\n"; 
 
 unless (-e "$DIR/whois") { 
     print "\nMaking $DIR/whois ...\n"; 
-    mkdir "$DIR/whois", 0700; 
+    mkdir "$DIR/whois", 0755; 
 }
 print "\n"; 
 
 unless (-e "$DIR/backup") { 
     print "\nMaking $DIR/backup ...\n"; 
-    mkdir "$DIR/backup", 0700; 
+    mkdir "$DIR/backup", 0755; 
 }
 print "\n"; 
 
@@ -119,7 +119,7 @@
         system "mv $DIR/$_ $DIR/backup/$_";
     }    
     print "Copying $_ to $DIR ...\n"; 
-    system "cp $_ $DIR"; 
+    system "%%INSTALL_DATA%% $_ $DIR"; 
     print "\n";
 } @PACKAGE;