diff -u --new-file --recursive xastir-1.6.0.orig/scripts/coord-convert.pl xastir-1.6.0/scripts/coord-convert.pl
--- xastir-1.6.0.orig/scripts/coord-convert.pl	2002-08-26 23:52:03.000000000 +0200
+++ xastir-1.6.0/scripts/coord-convert.pl	2005-08-03 23:20:10.000000000 +0200
@@ -26,7 +26,7 @@
 #
 
 
-use lib "/usr/local/lib";
+use lib "/usr/lib";
 use Coordinate;         # WE7U's Coordinate.pm module
 
 
diff -u --new-file --recursive xastir-1.6.0.orig/scripts/fcc-get xastir-1.6.0/scripts/fcc-get
--- xastir-1.6.0.orig/scripts/fcc-get	2005-02-04 20:36:01.000000000 +0100
+++ xastir-1.6.0/scripts/fcc-get	2005-08-03 23:20:10.000000000 +0200
@@ -10,7 +10,7 @@
 # Note: Run this script as root in order to write the files into the
 # destination directory listed below.
 #
-XASTIR_BASE=/usr/local/share/xastir
+XASTIR_BASE=/usr/share/xastir
 cd /var/tmp
 #
 #
diff -u --new-file --recursive xastir-1.6.0.orig/scripts/icontable.pl xastir-1.6.0/scripts/icontable.pl
--- xastir-1.6.0.orig/scripts/icontable.pl	2003-07-07 19:17:54.000000000 +0200
+++ xastir-1.6.0/scripts/icontable.pl	2005-08-03 23:20:10.000000000 +0200
@@ -29,7 +29,7 @@
 #--------------------------------------------------------------------------
                                             
 # symbols file from XASTIR V2.1, change the path for your environment
-$SYMBFILE = "/usr/local/share/xastir/symbols/symbols.dat";
+$SYMBFILE = "/usr/share/xastir/symbols/symbols.dat";
 
 #--------------------------------------------------------------------------
 %sympix = ();
diff -u --new-file --recursive xastir-1.6.0.orig/scripts/permutations.pl xastir-1.6.0/scripts/permutations.pl
--- xastir-1.6.0.orig/scripts/permutations.pl	2005-03-25 21:53:04.000000000 +0100
+++ xastir-1.6.0/scripts/permutations.pl	2005-08-03 23:20:10.000000000 +0200
@@ -34,7 +34,7 @@
 #
 
 
-use lib "/usr/local/lib";
+use lib "/usr/lib";
 use Coordinate;         # WE7U's Coordinate.pm module
 
 
diff -u --new-file --recursive xastir-1.6.0.orig/scripts/xastir-fixcfg.sh xastir-1.6.0/scripts/xastir-fixcfg.sh
--- xastir-1.6.0.orig/scripts/xastir-fixcfg.sh	2005-01-08 10:27:08.000000000 +0100
+++ xastir-1.6.0/scripts/xastir-fixcfg.sh	2005-08-03 23:20:10.000000000 +0200
@@ -4,8 +4,8 @@
 #
 # Copyright (C) 2003-2005  The Xastir Group
 #
-# fix up a user's .xastir/config/xastir.cnf to rewrite /usr/local/xastir
-# to /usr/local/share/xastir.  NOTE: This only works when -prefix=/usr/local!
+# fix up a user's .xastir/config/xastir.cnf to rewrite /usr/xastir
+# to /usr/share/xastir.  NOTE: This only works when -prefix=/usr/local!
 CNF=.xastir/config/xastir.cnf
 INDEX=.xastir/config/map_index.sys
 SELECT=.xastir/config/selected_maps.sys
@@ -18,7 +18,7 @@
 	echo "$CNF: unable to rename!"
 	exit 1
     fi
-    sed -e 's:/usr/local/xastir/:/usr/local/share/xastir/:' <$CNF.backup >$CNF
+    sed -e 's:/usr/xastir/:/usr/share/xastir/:' <$CNF.backup >$CNF
     if [ $? -ne 0 ]; then
 	echo "$CNF: sed failed!"
 	mv $CNF.backup $CNF
diff -u --new-file --recursive xastir-1.6.0.orig/scripts/xastir-migrate.sh xastir-1.6.0/scripts/xastir-migrate.sh
--- xastir-1.6.0.orig/scripts/xastir-migrate.sh	2005-01-08 10:27:08.000000000 +0100
+++ xastir-1.6.0/scripts/xastir-migrate.sh	2005-08-03 23:20:10.000000000 +0200
@@ -5,12 +5,12 @@
 # Copyright (C) 2003-2005  The Xastir Group
 #
 # migrate from old xastir USER FILES to new directory structure.
-# Stuff that was under /usr/local/xastir is now under /usr/local/share/xastir/
+# Stuff that was under /usr/xastir is now under /usr/share/xastir/
 # fixed up the .xastir/config/xastir.cfg as well.
 # XXX Do we throw away the xastir non-user files (config, doc, help)?
 PREFIX=
-OLD=$PREFIX/usr/local/xastir
-NEW=$PREFIX/usr/local/share/xastir
+OLD=$PREFIX/usr/xastir
+NEW=$PREFIX/usr/share/xastir
 rr=0
 if [ -d $OLD ]; then
         if [ ! -d $NEW ]; then