From ad4bd6c2ceb6ce75fbaca58a95435c3f5f63e920 Mon Sep 17 00:00:00 2001
From: durk <durk>
Date: Wed, 10 Dec 2008 18:41:34 +0000
Subject: [PATCH] Some final adjustments:  - Remove Concorde, as announced  -
 Add a missing directory to utils/Makefile.am, which caused an autoconf   
 error.

---
 Makefile.am       | 1 -
 utils/Makefile.am | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9b9f6abef..9b63357dc 100644
--- 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 014d49cb0..5989c57f1 100644
--- 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