diff -c -r xastir-1.1.5.june/config/Makefile.am xastir-1.1.5/config/Makefile.am
*** xastir-1.1.5.june/config/Makefile.am	2003-02-18 15:49:28.000000000 -0500
--- xastir-1.1.5/config/Makefile.am	2003-06-09 09:02:09.000000000 -0400
***************
*** 1,5 ****
  # $Id: Makefile.am,v 1.5 2003/02/18 20:49:28 kg4ijb Exp $
! configdir = ${prefix}/xastir/config
  
  EXTRA_DIST = \
      language-Dutch.sys \
--- 1,5 ----
  # $Id: Makefile.am,v 1.5 2003/02/18 20:49:28 kg4ijb Exp $
! configdir = ${pkgdatadir}/config
  
  EXTRA_DIST = \
      language-Dutch.sys \
diff -c -r xastir-1.2.0/configure.ac xastir-1.2.0-p/configure.ac
*** xastir-1.2.0/configure.ac	2003-06-13 17:15:40.000000000 -0400
--- xastir-1.2.0-p/configure.ac	2003-06-17 22:16:54.000000000 -0400
***************
*** 188,198 ****
  AC_DEFINE(HAVE_LIBAX25, , Define to 1 if you have the `ax25' library (-lax25). )
  break)])
   
! # Set XASTIR_DATA_BASE in config.h. 
! if test "x${prefix}" = "xNONE"; then 
!   AC_DEFINE_UNQUOTED(XASTIR_DATA_BASE, "${ac_default_prefix}/xastir", [Stored data]) 
  else 
!   AC_DEFINE_UNQUOTED(XASTIR_DATA_BASE, "${prefix}/xastir", [Stored data]) 
  fi 
   
  # 
--- 188,199 ----
  AC_DEFINE(HAVE_LIBAX25, , Define to 1 if you have the `ax25' library (-lax25). )
  break)])
   
! # Set XASTIR_DATA_BASE in CPPFLAGS due to Gnu coding standard that requires
! # datadir expansion to be deferred until make time.
! if test "x${datadir}" = "x"; then 
!   CPPFLAGS="$CPPFLAGS -DXASTIR_DATA_BASE=\\\"${ac_default_prefix}/share/xastir\\\""
  else 
!   CPPFLAGS="$CPPFLAGS -DXASTIR_DATA_BASE=\\\"${datadir}/xastir\\\""
  fi 
   
  # 
diff -c -r xastir-1.1.5.june/help/Makefile.am xastir-1.1.5/help/Makefile.am
*** xastir-1.1.5.june/help/Makefile.am	2003-02-18 15:49:46.000000000 -0500
--- xastir-1.1.5/help/Makefile.am	2003-06-09 09:04:48.000000000 -0400
***************
*** 1,5 ****
  # $Id: Makefile.am,v 1.3 2003/02/18 20:49:46 kg4ijb Exp $
! helpdir = ${prefix}/xastir/help
  EXTRA_DIST = \
      help-Dutch.dat \
      help-English.dat \
--- 1,5 ----
  # $Id: Makefile.am,v 1.3 2003/02/18 20:49:46 kg4ijb Exp $
! helpdir = ${pkgdatadir}/help
  EXTRA_DIST = \
      help-Dutch.dat \
      help-English.dat \
diff -c -r xastir-1.1.5.june/Makefile.am xastir-1.1.5/Makefile.am
*** xastir-1.1.5.june/Makefile.am	2003-05-23 16:32:20.000000000 -0400
--- xastir-1.1.5/Makefile.am	2003-06-09 09:07:08.000000000 -0400
***************
*** 19,43 ****
          config.guess config.sub install-sh missing mkinstalldirs \
          xastir.spec
  
! countydir=${prefix}/xastir/Counties
  county_DATA=placeholder
  
! fccdir=${prefix}/xastir/fcc
  fcc_DATA=placeholder
  
! gnisdir=${prefix}/xastir/GNIS
  gnis_DATA=placeholder
  
! mapdir=${prefix}/xastir/maps
  map_DATA=placeholder terraserver.geo toposerver.geo
  
! gpsdir=${prefix}/xastir/maps/GPS
  gps_DATA=placeholder
  
! sounddir=${prefix}/xastir/sounds
  sound_DATA=placeholder
  
! docdir=${prefix}/xastir/doc
  doc_DATA=AUTHORS FAQ ChangeLog LICENSE README README.CVS \
          README.MAPS README.win32 COPYING INSTALL UPGRADE
  
--- 19,43 ----
          config.guess config.sub install-sh missing mkinstalldirs \
          xastir.spec
  
! countydir=${pkgdatadir}/Counties
  county_DATA=placeholder
  
! fccdir=${pkgdatadir}/fcc
  fcc_DATA=placeholder
  
! gnisdir=${pkgdatadir}/GNIS
  gnis_DATA=placeholder
  
! mapdir=${pkgdatadir}/maps
  map_DATA=placeholder terraserver.geo toposerver.geo
  
! gpsdir=${pkgdatadir}/maps/GPS
  gps_DATA=placeholder
  
! sounddir=${pkgdatadir}/sounds
  sound_DATA=placeholder
  
! docdir=${pkgdatadir}/doc
  doc_DATA=AUTHORS FAQ ChangeLog LICENSE README README.CVS \
          README.MAPS README.win32 COPYING INSTALL UPGRADE
  
diff -c -r xastir-1.1.5.june/symbols/Makefile.am xastir-1.1.5/symbols/Makefile.am
*** xastir-1.1.5.june/symbols/Makefile.am	2003-02-18 15:50:25.000000000 -0500
--- xastir-1.1.5/symbols/Makefile.am	2003-06-09 09:08:24.000000000 -0400
***************
*** 1,4 ****
  # $Id: Makefile.am,v 1.5 2003/02/18 20:50:25 kg4ijb Exp $
! symbolsdir=${prefix}/xastir/symbols
  EXTRA_DIST=symbols.dat 2x2.xbm 25pct.xbm 13pct.xbm alert.xbm flood.xbm snow.xbm tornado.xbm wind.xbm winter_wx.xbm wntr_strm.xbm
  symbols_DATA= symbols.dat 2x2.xbm 25pct.xbm 13pct.xbm alert.xbm flood.xbm snow.xbm tornado.xbm wind.xbm winter_wx.xbm wntr_strm.xbm
--- 1,4 ----
  # $Id: Makefile.am,v 1.5 2003/02/18 20:50:25 kg4ijb Exp $
! symbolsdir=${pkgdatadir}/symbols
  EXTRA_DIST=symbols.dat 2x2.xbm 25pct.xbm 13pct.xbm alert.xbm flood.xbm snow.xbm tornado.xbm wind.xbm winter_wx.xbm wntr_strm.xbm
  symbols_DATA= symbols.dat 2x2.xbm 25pct.xbm 13pct.xbm alert.xbm flood.xbm snow.xbm tornado.xbm wind.xbm winter_wx.xbm wntr_strm.xbm