Some final adjustments:

 - Remove Concorde, as announced
 - Add a missing directory to utils/Makefile.am, which caused an autoconf
   error.

diff --git a/Makefile.am b/Makefile.am
index 9b9f6abef8c312b37115ecc8076eef5dbee81d67..9b63357dc0873c8d6f9dd29be5a6015f18d79a3e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,7 +67,6 @@ data-tar:
                 data/Aircraft/bo105 \
                 data/Aircraft/c172p \
                 data/Aircraft/CitationX \
-               data/Aircraft/Concorde \
                data/Aircraft/Dragonfly \
                data/Aircraft/dhc2 \
                data/Aircraft/f-14b \

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 014d49cb0bc786d6905ece54cae2093737a1d0a9..5989c57f1951a27d56de00ee2847b83d424318aa 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = GPSsmooth TerraSync Modeller js_server fgadmin xmlgrep
+DIST_SUBDIRS = GPSsmooth TerraSync Modeller js_server fgadmin xmlgrep propmerge
 
 SUBDIRS = GPSsmooth TerraSync Modeller js_server propmerge