+++ /dev/null
-diff -u scripts.orig/Makefile.am scripts/Makefile.am
---- scripts.orig/Makefile.am 2008-06-24 17:48:59.000000000 +0200
-+++ scripts/Makefile.am 2008-08-16 07:47:00.000000000 +0200
-@@ -8,9 +8,7 @@
- coord-convert.pl \
- get-fcc-rac.pl \
- get-gnis \
-- get-maptools.sh \
- get-NWSdata \
-- get_shapelib.sh \
- gpx2shape \
- icontable.pl \
- inf2geo.pl \
-@@ -29,8 +27,6 @@
- track-get.pl \
- update_langfile.pl \
- waypoint-get.pl \
-- xastir-fixcfg.sh \
-- xastir-migrate.sh \
- Xastir_tigerpoly.py
-
-
-diff -u scripts.orig/coord-convert.pl scripts/coord-convert.pl
---- scripts.orig/coord-convert.pl 2002-08-26 23:52:03.000000000 +0200
-+++ scripts/coord-convert.pl 2008-08-16 07:47:00.000000000 +0200
-@@ -26,7 +26,7 @@
- #
-
-
--use lib "/usr/local/lib";
-+use lib "/usr/lib";
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -u scripts.orig/get-NWSdata scripts/get-NWSdata
---- scripts.orig/get-NWSdata 2008-07-18 17:26:39.000000000 +0200
-+++ scripts/get-NWSdata 2008-08-16 07:47:00.000000000 +0200
-@@ -40,7 +40,7 @@
- FILE6="fz25jn08" # NWSM Libraries: Fire Weather Zone Boundaries
- FILE7="c_11mr07" # County Libraries: AWIPS Counties
-
--cd /usr/local/share/xastir/Counties
-+cd /usr/share/xastir/Counties
-
-
- # Remove any old zip files hanging around in this directory
-diff -u scripts.orig/get-fcc-rac.pl scripts/get-fcc-rac.pl
---- scripts.orig/get-fcc-rac.pl 2008-06-24 17:48:59.000000000 +0200
-+++ scripts/get-fcc-rac.pl 2008-08-16 08:07:57.000000000 +0200
-@@ -9,7 +9,7 @@
- #
- # Note: Run this script as root in order to write the files into the
- # destination directory listed below, or change directory write access.
--my $XASTIR_BASE="/usr/local/share/xastir";
-+my $XASTIR_BASE="/usr/share/xastir";
-
-
- # This script uses temporary storage space in /var/tmp to do its work.
-diff -u scripts.orig/get-gnis scripts/get-gnis
---- scripts.orig/get-gnis 2008-07-01 03:47:48.000000000 +0200
-+++ scripts/get-gnis 2008-08-16 08:07:12.000000000 +0200
-@@ -55,8 +55,8 @@
-
- if ( [ -f ${MYSTATE}_DECI.txt ] )
- then
-- printf "File successfully downloaded. Moving to /usr/local/share/xastir/GNIS\n"
-- sudo mv ${MYSTATE}_DECI.txt /usr/local/share/xastir/GNIS/${MYSTATE}.gnis
-+ printf "File successfully downloaded. Moving to /usr/share/xastir/GNIS\n"
-+ sudo mv ${MYSTATE}_DECI.txt /usr/share/xastir/GNIS/${MYSTATE}.gnis
- else
- printf "File for %s not successfully downloaded.\n" ${MYSTATE}
- fi
-diff -u scripts.orig/get-maptools.sh scripts/get-maptools.sh
---- scripts.orig/get-maptools.sh 2008-01-16 20:33:59.000000000 +0100
-+++ scripts/get-maptools.sh 2008-08-16 07:47:00.000000000 +0200
-@@ -135,11 +135,11 @@
- fi
- fi
-
-- if touch -a /usr/local/lib
-+ if touch -a /usr/lib
- then
-- printf "We can modify /usr/local/lib\n"
-+ printf "We can modify /usr/lib\n"
- else
-- printf "ERROR: We cannot modify /usr/local/lib - aborting\n"
-+ printf "ERROR: We cannot modify /usr/lib - aborting\n"
- exit
- fi
- fi
-@@ -163,22 +163,22 @@
- sudo touch $LDCONF_FILE
- fi
-
-- if (! grep /usr/local/lib $LDCONF_FILE 2>&1 > /dev/null)
-+ if (! grep /usr/lib $LDCONF_FILE 2>&1 > /dev/null)
- then
-- printf "Warning: /usr/local/lib not in %s - adding it\n" $LDCONF_FILE
-+ printf "Warning: /usr/lib not in %s - adding it\n" $LDCONF_FILE
- if [ -f $LDCONF_FILE ]
- then
- cp $LDCONF_FILE /tmp/ldconfig.tmp
- $SUDO cp $LDCONF_FILE $LDCONF_FILE.orig.$$
- fi
-- printf "/usr/local/lib\n" >> /tmp/ldconf.tmp
-+ printf "/usr/lib\n" >> /tmp/ldconf.tmp
- $SUDO cp /tmp/ldconf.tmp $LDCONF_FILE
-
- fi
-
-- if (! grep /usr/local/lib $LDCONF_FILE 2>&1 > /dev/null)
-+ if (! grep /usr/lib $LDCONF_FILE 2>&1 > /dev/null)
- then
-- printf "ERROR: could not add /usr/local/lib to %s - aborting\n " $LDCONFIG_FILE
-+ printf "ERROR: could not add /usr/lib to %s - aborting\n " $LDCONFIG_FILE
- exit
- fi
-
-diff -u scripts.orig/icontable.pl scripts/icontable.pl
---- scripts.orig/icontable.pl 2003-07-07 19:17:54.000000000 +0200
-+++ scripts/icontable.pl 2008-08-16 07:47:00.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 scripts.orig/permutations.pl scripts/permutations.pl
---- scripts.orig/permutations.pl 2005-03-25 21:53:04.000000000 +0100
-+++ scripts/permutations.pl 2008-08-16 07:47:00.000000000 +0200
-@@ -34,7 +34,7 @@
- #
-
-
--use lib "/usr/local/lib";
-+use lib "/usr/lib";
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -u scripts.orig/test_coord.pl scripts/test_coord.pl
---- scripts.orig/test_coord.pl 2003-01-06 23:42:17.000000000 +0100
-+++ scripts/test_coord.pl 2008-08-16 07:47:00.000000000 +0200
-@@ -33,7 +33,7 @@
-
- #------------------------------------------------------------------------------------------------
-
--use lib "/usr/local/lib";
-+use lib "/usr/lib";
- use Coordinate; # Snag WE7U's Coordinate module
-
-
-diff -u scripts.orig/toporama250k.pl scripts/toporama250k.pl
---- scripts.orig/toporama250k.pl 2008-08-16 07:42:13.000000000 +0200
-+++ scripts/toporama250k.pl 2008-08-16 08:03:08.000000000 +0200
-@@ -28,14 +28,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama250k.pl"
-+# - "/usr/lib/xastir/toporama250k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
-diff -u scripts.orig/toporama50k.pl scripts/toporama50k.pl
---- scripts.orig/toporama50k.pl 2008-08-16 07:42:13.000000000 +0200
-+++ scripts/toporama50k.pl 2008-08-16 08:02:48.000000000 +0200
-@@ -27,14 +27,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama50k.pl"
-+# - "/usr/lib/xastir/toporama50k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
--- /dev/null
+diff -ur scripts.orig/Makefile.am scripts/Makefile.am
+--- scripts.orig/Makefile.am 2009-10-15 21:47:20.000000000 +0200
++++ scripts/Makefile.am 2009-10-15 21:47:57.000000000 +0200
+@@ -9,9 +9,7 @@
+ get-fcc-rac.pl \
+ get-gnis \
+ get-pop \
+- get-maptools.sh \
+ get-NWSdata \
+- get_shapelib.sh \
+ gpx2shape \
+ icontable.pl \
+ inf2geo.pl \
+@@ -39,8 +37,6 @@
+ values \
+ values.pl \
+ waypoint-get.pl \
+- xastir-fixcfg.sh \
+- xastir-migrate.sh \
+ Xastir_tigerpoly.py
+
+ EXTRA_DIST = $(pkglib_SCRIPTS)
+diff -u scripts.orig/permutations.pl scripts/permutations.pl
+--- scripts.orig/permutations.pl 2005-03-25 21:53:04.000000000 +0100
++++ scripts/permutations.pl 2008-08-16 07:47:00.000000000 +0200
+@@ -34,7 +34,7 @@
+ #
+
+
+-use lib "/usr/local/lib";
++use lib "/usr/lib";
+ use Coordinate; # WE7U's Coordinate.pm module
+
+
+diff -u scripts.orig/test_coord.pl scripts/test_coord.pl
+--- scripts.orig/test_coord.pl 2003-01-06 23:42:17.000000000 +0100
++++ scripts/test_coord.pl 2008-08-16 07:47:00.000000000 +0200
+@@ -33,7 +33,7 @@
+
+ #------------------------------------------------------------------------------------------------
+
+-use lib "/usr/local/lib";
++use lib "/usr/lib";
+ use Coordinate; # Snag WE7U's Coordinate module
+
+
+diff -u scripts.orig/toporama250k.pl scripts/toporama250k.pl
+--- scripts.orig/toporama250k.pl 2008-08-16 07:42:13.000000000 +0200
++++ scripts/toporama250k.pl 2008-08-16 08:03:08.000000000 +0200
+@@ -28,14 +28,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ # by becoming root using the "su" command, using "sudo", or
+ # temporarily changing ownership and/or privileges on the
+ # "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama250k.pl"
++# - "/usr/lib/xastir/toporama250k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ # .../maps/toporama/images/
+diff -u scripts.orig/toporama50k.pl scripts/toporama50k.pl
+--- scripts.orig/toporama50k.pl 2008-08-16 07:42:13.000000000 +0200
++++ scripts/toporama50k.pl 2008-08-16 08:02:48.000000000 +0200
+@@ -27,14 +27,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ # by becoming root using the "su" command, using "sudo", or
+ # temporarily changing ownership and/or privileges on the
+ # "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama50k.pl"
++# - "/usr/lib/xastir/toporama50k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ # .../maps/toporama/images/