From 06cdaa10b2c701ab290e36a0e6922aaa017cae43 Mon Sep 17 00:00:00 2001
From: James Goppert <jgoppert@w7.hsl.dynalias.com>
Date: Sat, 25 Sep 2010 21:25:43 -0400
Subject: [PATCH] Passed dist, check. This is adv-trim dist.
---
Makefile.am | 2 +-
aircraft/737/Makefile.am | 2 +-
aircraft/A320/Makefile.am | 2 +-
aircraft/A4/Makefile.am | 2 +-
aircraft/B17/Makefile.am | 2 +-
aircraft/B747/Makefile.am | 2 +-
aircraft/Boeing314/Makefile.am | 2 +-
aircraft/C130/Makefile.am | 2 +-
aircraft/Concorde/Makefile.am | 2 +-
aircraft/DHC6/Makefile.am | 2 +-
aircraft/F4N/Engines/Makefile.am | 2 +-
aircraft/F4N/Makefile.am | 2 +-
aircraft/F80C/Makefile.am | 2 +-
aircraft/J246/Makefile.am | 2 +-
aircraft/J246/Systems/Makefile.am | 2 +-
aircraft/L17/Makefile.am | 2 +-
aircraft/L410/Makefile.am | 2 +-
aircraft/LM/Makefile.am | 2 +-
aircraft/MD11/Makefile.am | 2 +-
aircraft/Makefile.am | 2 +-
aircraft/OV10/Makefile.am | 2 +-
aircraft/SGS/Makefile.am | 2 +-
aircraft/Short_S23/Makefile.am | 2 +-
aircraft/Short_S23/Systems/Makefile.am | 2 +-
aircraft/Shuttle/Makefile.am | 2 +-
aircraft/Submarine_Scout/Makefile.am | 2 +-
aircraft/Submarine_Scout/Systems/Makefile.am | 2 +-
aircraft/T37/Makefile.am | 2 +-
aircraft/T38/Makefile.am | 2 +-
aircraft/X15/Makefile.am | 2 +-
aircraft/XB-70/Makefile.am | 2 +-
aircraft/ZLT-NT/Makefile.am | 2 +-
aircraft/ZLT-NT/Systems/Makefile.am | 2 +-
aircraft/ah1s/Makefile.am | 2 +-
aircraft/ball/Makefile.am | 2 +-
aircraft/blank/Makefile.am | 2 +-
aircraft/c172p/Makefile.am | 2 +-
aircraft/c172r/Makefile.am | 2 +-
aircraft/c172x/Makefile.am | 2 +-
aircraft/c182/Makefile.am | 2 +-
aircraft/c310/Makefile.am | 2 +-
aircraft/dr1/Makefile.am | 2 +-
aircraft/f104/Makefile.am | 2 +-
aircraft/f15/Makefile.am | 2 +-
aircraft/f16/Makefile.am | 2 +-
aircraft/f16/Systems/Makefile.am | 2 +-
aircraft/f22/Makefile.am | 2 +-
aircraft/fokker100/Makefile.am | 2 +-
aircraft/fokker100/Systems/Makefile.am | 2 +-
aircraft/fokker50/Makefile.am | 2 +-
aircraft/minisgs/Makefile.am | 2 +-
aircraft/mk82/Makefile.am | 2 +-
aircraft/p51d/Engines/Makefile.am | 2 +-
aircraft/p51d/Makefile.am | 2 +-
aircraft/p51d/Systems/Makefile.am | 2 +-
aircraft/pa28/Makefile.am | 2 +-
aircraft/paraglider/Makefile.am | 2 +-
aircraft/pc7/Makefile.am | 2 +-
aircraft/pogo-jsbsim/Engines/Makefile.am | 2 +-
aircraft/pogo-jsbsim/Makefile.am | 2 +-
aircraft/sgs126/Makefile.am | 2 +-
aircraft/sgs233/Makefile.am | 2 +-
aircraft/t6texan2/Makefile.am | 2 +-
aircraft/x24b/Makefile.am | 2 +-
engine/Makefile.am | 2 +-
systems/Makefile.am | 2 +-
updateAutomake.sh | 2 +-
67 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 2e45b6e..3821750 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
EXTRA_DIST = \
- autogen.sh JSBSim.xsd JSBSim.xsl JSBSim.vcproj JSBSim.dox
+ autogen.sh JSBSim.xsd JSBSim.xsl JSBSim.vcproj JSBSim.dox updateAutomake.sh
SUBDIRS = src systems aircraft engine scripts data_output data_plot check_cases
diff --git a/aircraft/737/Makefile.am b/aircraft/737/Makefile.am
index c474b5a..61f7c77 100644
--- a/aircraft/737/Makefile.am
+++ b/aircraft/737/Makefile.am
@@ -5,4 +5,4 @@ aircraft_737_DATA = \
reset00.xml \
cruise_steady_turn_init.xml \
cruise_init.xml
-EXTRA_DIST=$(aircraft_737_data)
+EXTRA_DIST=$(aircraft_737_DATA)
diff --git a/aircraft/A320/Makefile.am b/aircraft/A320/Makefile.am
index af902fe..ac30ab6 100644
--- a/aircraft/A320/Makefile.am
+++ b/aircraft/A320/Makefile.am
@@ -1,4 +1,4 @@
aircraft_A320dir = ${pkgdatadir}/aircraft/A320
aircraft_A320_DATA = \
A320.xml
-EXTRA_DIST=$(aircraft_A320_data)
+EXTRA_DIST=$(aircraft_A320_DATA)
diff --git a/aircraft/A4/Makefile.am b/aircraft/A4/Makefile.am
index 2ba7b5c..67dfb50 100644
--- a/aircraft/A4/Makefile.am
+++ b/aircraft/A4/Makefile.am
@@ -1,4 +1,4 @@
aircraft_A4dir = ${pkgdatadir}/aircraft/A4
aircraft_A4_DATA = \
A4.xml
-EXTRA_DIST=$(aircraft_A4_data)
+EXTRA_DIST=$(aircraft_A4_DATA)
diff --git a/aircraft/B17/Makefile.am b/aircraft/B17/Makefile.am
index 6632f03..80c1dc9 100644
--- a/aircraft/B17/Makefile.am
+++ b/aircraft/B17/Makefile.am
@@ -3,4 +3,4 @@ aircraft_B17_DATA = \
INSTALL \
reset00.xml \
B17.xml
-EXTRA_DIST=$(aircraft_B17_data)
+EXTRA_DIST=$(aircraft_B17_DATA)
diff --git a/aircraft/B747/Makefile.am b/aircraft/B747/Makefile.am
index ea46269..5ec12ae 100644
--- a/aircraft/B747/Makefile.am
+++ b/aircraft/B747/Makefile.am
@@ -3,4 +3,4 @@ aircraft_B747_DATA = \
INSTALL \
reset00.xml \
B747.xml
-EXTRA_DIST=$(aircraft_B747_data)
+EXTRA_DIST=$(aircraft_B747_DATA)
diff --git a/aircraft/Boeing314/Makefile.am b/aircraft/Boeing314/Makefile.am
index 84997d7..2b52339 100644
--- a/aircraft/Boeing314/Makefile.am
+++ b/aircraft/Boeing314/Makefile.am
@@ -2,4 +2,4 @@ aircraft_Boeing314dir = ${pkgdatadir}/aircraft/Boeing314
aircraft_Boeing314_DATA = \
INSTALL \
Boeing314.xml
-EXTRA_DIST=$(aircraft_Boeing314_data)
+EXTRA_DIST=$(aircraft_Boeing314_DATA)
diff --git a/aircraft/C130/Makefile.am b/aircraft/C130/Makefile.am
index 122ff5e..cc49a36 100644
--- a/aircraft/C130/Makefile.am
+++ b/aircraft/C130/Makefile.am
@@ -3,4 +3,4 @@ aircraft_C130_DATA = \
INSTALL \
reset00.xml \
C130.xml
-EXTRA_DIST=$(aircraft_C130_data)
+EXTRA_DIST=$(aircraft_C130_DATA)
diff --git a/aircraft/Concorde/Makefile.am b/aircraft/Concorde/Makefile.am
index 386c315..3839a33 100644
--- a/aircraft/Concorde/Makefile.am
+++ b/aircraft/Concorde/Makefile.am
@@ -1,4 +1,4 @@
aircraft_Concordedir = ${pkgdatadir}/aircraft/Concorde
aircraft_Concorde_DATA = \
Concorde.xml
-EXTRA_DIST=$(aircraft_Concorde_data)
+EXTRA_DIST=$(aircraft_Concorde_DATA)
diff --git a/aircraft/DHC6/Makefile.am b/aircraft/DHC6/Makefile.am
index 7a5cabd..93fba79 100644
--- a/aircraft/DHC6/Makefile.am
+++ b/aircraft/DHC6/Makefile.am
@@ -2,4 +2,4 @@ aircraft_DHC6dir = ${pkgdatadir}/aircraft/DHC6
aircraft_DHC6_DATA = \
INSTALL \
DHC6.xml
-EXTRA_DIST=$(aircraft_DHC6_data)
+EXTRA_DIST=$(aircraft_DHC6_DATA)
diff --git a/aircraft/F4N/Engines/Makefile.am b/aircraft/F4N/Engines/Makefile.am
index cd7aae2..18edb36 100644
--- a/aircraft/F4N/Engines/Makefile.am
+++ b/aircraft/F4N/Engines/Makefile.am
@@ -2,4 +2,4 @@ aircraft_F4N_Enginesdir = ${pkgdatadir}/aircraft/F4N/Engines
aircraft_F4N_Engines_DATA = \
direct.xml \
J79-GE-11A.xml
-EXTRA_DIST=$(aircraft_F4N_Engines_data)
+EXTRA_DIST=$(aircraft_F4N_Engines_DATA)
diff --git a/aircraft/F4N/Makefile.am b/aircraft/F4N/Makefile.am
index 858b1df..f044efa 100644
--- a/aircraft/F4N/Makefile.am
+++ b/aircraft/F4N/Makefile.am
@@ -6,4 +6,4 @@ aircraft_F4N_DATA = \
reset00.xml \
F4N.xml \
F4N-jsbsim.xml
-EXTRA_DIST=$(aircraft_F4N_data)
+EXTRA_DIST=$(aircraft_F4N_DATA)
diff --git a/aircraft/F80C/Makefile.am b/aircraft/F80C/Makefile.am
index 49db6ef..56edc37 100644
--- a/aircraft/F80C/Makefile.am
+++ b/aircraft/F80C/Makefile.am
@@ -1,4 +1,4 @@
aircraft_F80Cdir = ${pkgdatadir}/aircraft/F80C
aircraft_F80C_DATA = \
F80C.xml
-EXTRA_DIST=$(aircraft_F80C_data)
+EXTRA_DIST=$(aircraft_F80C_DATA)
diff --git a/aircraft/J246/Makefile.am b/aircraft/J246/Makefile.am
index 76f5ab2..b67a644 100644
--- a/aircraft/J246/Makefile.am
+++ b/aircraft/J246/Makefile.am
@@ -4,4 +4,4 @@ aircraft_J246dir = ${pkgdatadir}/aircraft/J246
aircraft_J246_DATA = \
LC39.xml \
J246.xml
-EXTRA_DIST=$(aircraft_J246_data)
+EXTRA_DIST=$(aircraft_J246_DATA)
diff --git a/aircraft/J246/Systems/Makefile.am b/aircraft/J246/Systems/Makefile.am
index ecb2b73..975d1a7 100644
--- a/aircraft/J246/Systems/Makefile.am
+++ b/aircraft/J246/Systems/Makefile.am
@@ -4,4 +4,4 @@ aircraft_J246_Systems_DATA = \
J246GuidanceExecutive.xml \
J246SecondStageEffectors.xml \
J246FirstStageEffectors.xml
-EXTRA_DIST=$(aircraft_J246_Systems_data)
+EXTRA_DIST=$(aircraft_J246_Systems_DATA)
diff --git a/aircraft/L17/Makefile.am b/aircraft/L17/Makefile.am
index 7e3fe58..8a46de4 100644
--- a/aircraft/L17/Makefile.am
+++ b/aircraft/L17/Makefile.am
@@ -2,4 +2,4 @@ aircraft_L17dir = ${pkgdatadir}/aircraft/L17
aircraft_L17_DATA = \
INSTALL \
L17.xml
-EXTRA_DIST=$(aircraft_L17_data)
+EXTRA_DIST=$(aircraft_L17_DATA)
diff --git a/aircraft/L410/Makefile.am b/aircraft/L410/Makefile.am
index d46d869..50cd887 100644
--- a/aircraft/L410/Makefile.am
+++ b/aircraft/L410/Makefile.am
@@ -2,4 +2,4 @@ aircraft_L410dir = ${pkgdatadir}/aircraft/L410
aircraft_L410_DATA = \
INSTALL \
L410.xml
-EXTRA_DIST=$(aircraft_L410_data)
+EXTRA_DIST=$(aircraft_L410_DATA)
diff --git a/aircraft/LM/Makefile.am b/aircraft/LM/Makefile.am
index 75380c8..9776bca 100644
--- a/aircraft/LM/Makefile.am
+++ b/aircraft/LM/Makefile.am
@@ -1,4 +1,4 @@
aircraft_LMdir = ${pkgdatadir}/aircraft/LM
aircraft_LM_DATA = \
INSTALL
-EXTRA_DIST=$(aircraft_LM_data)
+EXTRA_DIST=$(aircraft_LM_DATA)
diff --git a/aircraft/MD11/Makefile.am b/aircraft/MD11/Makefile.am
index 44f07e1..654b69b 100644
--- a/aircraft/MD11/Makefile.am
+++ b/aircraft/MD11/Makefile.am
@@ -1,4 +1,4 @@
aircraft_MD11dir = ${pkgdatadir}/aircraft/MD11
aircraft_MD11_DATA = \
MD11.xml
-EXTRA_DIST=$(aircraft_MD11_data)
+EXTRA_DIST=$(aircraft_MD11_DATA)
diff --git a/aircraft/Makefile.am b/aircraft/Makefile.am
index 0ffb334..9b7f17f 100644
--- a/aircraft/Makefile.am
+++ b/aircraft/Makefile.am
@@ -54,4 +54,4 @@ SUBDIRS = \
aircraftdir = ${pkgdatadir}/aircraft
aircraft_DATA = \
aircraft_template.xml
-EXTRA_DIST=$(aircraft_data)
+EXTRA_DIST=$(aircraft_DATA)
diff --git a/aircraft/OV10/Makefile.am b/aircraft/OV10/Makefile.am
index e9d297a..3d9f1b7 100644
--- a/aircraft/OV10/Makefile.am
+++ b/aircraft/OV10/Makefile.am
@@ -2,4 +2,4 @@ aircraft_OV10dir = ${pkgdatadir}/aircraft/OV10
aircraft_OV10_DATA = \
reset00.xml \
OV10.xml
-EXTRA_DIST=$(aircraft_OV10_data)
+EXTRA_DIST=$(aircraft_OV10_DATA)
diff --git a/aircraft/SGS/Makefile.am b/aircraft/SGS/Makefile.am
index 70ebc91..614720f 100644
--- a/aircraft/SGS/Makefile.am
+++ b/aircraft/SGS/Makefile.am
@@ -3,4 +3,4 @@ aircraft_SGS_DATA = \
INSTALL \
reset00.xml \
SGS.xml
-EXTRA_DIST=$(aircraft_SGS_data)
+EXTRA_DIST=$(aircraft_SGS_DATA)
diff --git a/aircraft/Short_S23/Makefile.am b/aircraft/Short_S23/Makefile.am
index 3dfc2b8..1a860dd 100644
--- a/aircraft/Short_S23/Makefile.am
+++ b/aircraft/Short_S23/Makefile.am
@@ -6,4 +6,4 @@ aircraft_Short_S23_DATA = \
reset00.xml \
Short_S23.xml \
output.xml
-EXTRA_DIST=$(aircraft_Short_S23_data)
+EXTRA_DIST=$(aircraft_Short_S23_DATA)
diff --git a/aircraft/Short_S23/Systems/Makefile.am b/aircraft/Short_S23/Systems/Makefile.am
index c68ac8c..097565a 100644
--- a/aircraft/Short_S23/Systems/Makefile.am
+++ b/aircraft/Short_S23/Systems/Makefile.am
@@ -5,4 +5,4 @@ aircraft_Short_S23_Systems_DATA = \
take-off-ap.xml \
engines.xml \
datcom_aero.xml
-EXTRA_DIST=$(aircraft_Short_S23_Systems_data)
+EXTRA_DIST=$(aircraft_Short_S23_Systems_DATA)
diff --git a/aircraft/Shuttle/Makefile.am b/aircraft/Shuttle/Makefile.am
index dcdea20..965c9fc 100644
--- a/aircraft/Shuttle/Makefile.am
+++ b/aircraft/Shuttle/Makefile.am
@@ -2,4 +2,4 @@ aircraft_Shuttledir = ${pkgdatadir}/aircraft/Shuttle
aircraft_Shuttle_DATA = \
reset00.xml \
Shuttle.xml
-EXTRA_DIST=$(aircraft_Shuttle_data)
+EXTRA_DIST=$(aircraft_Shuttle_DATA)
diff --git a/aircraft/Submarine_Scout/Makefile.am b/aircraft/Submarine_Scout/Makefile.am
index e022da3..febabf5 100644
--- a/aircraft/Submarine_Scout/Makefile.am
+++ b/aircraft/Submarine_Scout/Makefile.am
@@ -7,4 +7,4 @@ aircraft_Submarine_Scout_DATA = \
takeoff.xml \
reset01.xml \
Submarine_Scout.xml
-EXTRA_DIST=$(aircraft_Submarine_Scout_data)
+EXTRA_DIST=$(aircraft_Submarine_Scout_DATA)
diff --git a/aircraft/Submarine_Scout/Systems/Makefile.am b/aircraft/Submarine_Scout/Systems/Makefile.am
index e7454f3..eac0b19 100644
--- a/aircraft/Submarine_Scout/Systems/Makefile.am
+++ b/aircraft/Submarine_Scout/Systems/Makefile.am
@@ -1,4 +1,4 @@
aircraft_Submarine_Scout_Systemsdir = ${pkgdatadir}/aircraft/Submarine_Scout/Systems
aircraft_Submarine_Scout_Systems_DATA = \
Submarine_Scout_crew_ap.xml
-EXTRA_DIST=$(aircraft_Submarine_Scout_Systems_data)
+EXTRA_DIST=$(aircraft_Submarine_Scout_Systems_DATA)
diff --git a/aircraft/T37/Makefile.am b/aircraft/T37/Makefile.am
index 65c8f7d..cc2e7b1 100644
--- a/aircraft/T37/Makefile.am
+++ b/aircraft/T37/Makefile.am
@@ -2,4 +2,4 @@ aircraft_T37dir = ${pkgdatadir}/aircraft/T37
aircraft_T37_DATA = \
reset00.xml \
T37.xml
-EXTRA_DIST=$(aircraft_T37_data)
+EXTRA_DIST=$(aircraft_T37_DATA)
diff --git a/aircraft/T38/Makefile.am b/aircraft/T38/Makefile.am
index 5deb144..bce2640 100644
--- a/aircraft/T38/Makefile.am
+++ b/aircraft/T38/Makefile.am
@@ -2,4 +2,4 @@ aircraft_T38dir = ${pkgdatadir}/aircraft/T38
aircraft_T38_DATA = \
reset00.xml \
T38.xml
-EXTRA_DIST=$(aircraft_T38_data)
+EXTRA_DIST=$(aircraft_T38_DATA)
diff --git a/aircraft/X15/Makefile.am b/aircraft/X15/Makefile.am
index 53fab1d..b4cfaf0 100644
--- a/aircraft/X15/Makefile.am
+++ b/aircraft/X15/Makefile.am
@@ -3,4 +3,4 @@ aircraft_X15_DATA = \
reset00.xml \
X15.xml \
reset01.xml
-EXTRA_DIST=$(aircraft_X15_data)
+EXTRA_DIST=$(aircraft_X15_DATA)
diff --git a/aircraft/XB-70/Makefile.am b/aircraft/XB-70/Makefile.am
index 6eec7eb..cef7181 100644
--- a/aircraft/XB-70/Makefile.am
+++ b/aircraft/XB-70/Makefile.am
@@ -3,4 +3,4 @@ aircraft_XB_70_DATA = \
INSTALL \
reset00.xml \
XB-70.xml
-EXTRA_DIST=$(aircraft_XB_70_data)
+EXTRA_DIST=$(aircraft_XB_70_DATA)
diff --git a/aircraft/ZLT-NT/Makefile.am b/aircraft/ZLT-NT/Makefile.am
index 9b9da6e..6a9e34d 100644
--- a/aircraft/ZLT-NT/Makefile.am
+++ b/aircraft/ZLT-NT/Makefile.am
@@ -5,4 +5,4 @@ aircraft_ZLT_NT_DATA = \
INSTALL \
reset00.xml \
ZLT-NT.xml
-EXTRA_DIST=$(aircraft_ZLT_NT_data)
+EXTRA_DIST=$(aircraft_ZLT_NT_DATA)
diff --git a/aircraft/ZLT-NT/Systems/Makefile.am b/aircraft/ZLT-NT/Systems/Makefile.am
index b6c8ea9..b148ec4 100644
--- a/aircraft/ZLT-NT/Systems/Makefile.am
+++ b/aircraft/ZLT-NT/Systems/Makefile.am
@@ -4,4 +4,4 @@ aircraft_ZLT_NT_Systems_DATA = \
air-and-gas-control.xml \
datcom_aero.xml \
gerris_aero.xml
-EXTRA_DIST=$(aircraft_ZLT_NT_Systems_data)
+EXTRA_DIST=$(aircraft_ZLT_NT_Systems_DATA)
diff --git a/aircraft/ah1s/Makefile.am b/aircraft/ah1s/Makefile.am
index c572791..32c7f8f 100644
--- a/aircraft/ah1s/Makefile.am
+++ b/aircraft/ah1s/Makefile.am
@@ -2,4 +2,4 @@ aircraft_ah1sdir = ${pkgdatadir}/aircraft/ah1s
aircraft_ah1s_DATA = \
reset00.xml \
ah1s.xml
-EXTRA_DIST=$(aircraft_ah1s_data)
+EXTRA_DIST=$(aircraft_ah1s_DATA)
diff --git a/aircraft/ball/Makefile.am b/aircraft/ball/Makefile.am
index 5f084d6..c881122 100644
--- a/aircraft/ball/Makefile.am
+++ b/aircraft/ball/Makefile.am
@@ -5,4 +5,4 @@ aircraft_ball_DATA = \
reset00.xml \
reset01.xml \
reset00_v2.xml
-EXTRA_DIST=$(aircraft_ball_data)
+EXTRA_DIST=$(aircraft_ball_DATA)
diff --git a/aircraft/blank/Makefile.am b/aircraft/blank/Makefile.am
index 1b77949..839abd3 100644
--- a/aircraft/blank/Makefile.am
+++ b/aircraft/blank/Makefile.am
@@ -3,4 +3,4 @@ aircraft_blank_DATA = \
INSTALL \
reset00.xml \
blank.xml
-EXTRA_DIST=$(aircraft_blank_data)
+EXTRA_DIST=$(aircraft_blank_DATA)
diff --git a/aircraft/c172p/Makefile.am b/aircraft/c172p/Makefile.am
index 37614a9..1d3f9db 100644
--- a/aircraft/c172p/Makefile.am
+++ b/aircraft/c172p/Makefile.am
@@ -4,4 +4,4 @@ aircraft_c172p_DATA = \
reset00.xml \
README.flightmodel.c172p \
reset01.xml
-EXTRA_DIST=$(aircraft_c172p_data)
+EXTRA_DIST=$(aircraft_c172p_DATA)
diff --git a/aircraft/c172r/Makefile.am b/aircraft/c172r/Makefile.am
index d8556a3..4b47b1f 100644
--- a/aircraft/c172r/Makefile.am
+++ b/aircraft/c172r/Makefile.am
@@ -4,4 +4,4 @@ aircraft_c172r_DATA = \
reset01.xml \
README.c172r \
c172r.xml
-EXTRA_DIST=$(aircraft_c172r_data)
+EXTRA_DIST=$(aircraft_c172r_DATA)
diff --git a/aircraft/c172x/Makefile.am b/aircraft/c172x/Makefile.am
index cdb6cdc..1b74b9d 100644
--- a/aircraft/c172x/Makefile.am
+++ b/aircraft/c172x/Makefile.am
@@ -7,4 +7,4 @@ aircraft_c172x_DATA = \
reset01.xml \
output.xml \
c172ap.xml
-EXTRA_DIST=$(aircraft_c172x_data)
+EXTRA_DIST=$(aircraft_c172x_DATA)
diff --git a/aircraft/c182/Makefile.am b/aircraft/c182/Makefile.am
index c5cbd92..c194802 100644
--- a/aircraft/c182/Makefile.am
+++ b/aircraft/c182/Makefile.am
@@ -3,4 +3,4 @@ aircraft_c182_DATA = \
reset00.xml \
c182.xml \
README.c182
-EXTRA_DIST=$(aircraft_c182_data)
+EXTRA_DIST=$(aircraft_c182_DATA)
diff --git a/aircraft/c310/Makefile.am b/aircraft/c310/Makefile.am
index 04a8eb4..1269b50 100644
--- a/aircraft/c310/Makefile.am
+++ b/aircraft/c310/Makefile.am
@@ -5,4 +5,4 @@ aircraft_c310_DATA = \
c310.xml \
README.c310 \
ellington.xml
-EXTRA_DIST=$(aircraft_c310_data)
+EXTRA_DIST=$(aircraft_c310_DATA)
diff --git a/aircraft/dr1/Makefile.am b/aircraft/dr1/Makefile.am
index df3a5a7..09a63b6 100644
--- a/aircraft/dr1/Makefile.am
+++ b/aircraft/dr1/Makefile.am
@@ -2,4 +2,4 @@ aircraft_dr1dir = ${pkgdatadir}/aircraft/dr1
aircraft_dr1_DATA = \
INSTALL \
dr1.xml
-EXTRA_DIST=$(aircraft_dr1_data)
+EXTRA_DIST=$(aircraft_dr1_DATA)
diff --git a/aircraft/f104/Makefile.am b/aircraft/f104/Makefile.am
index 2366261..31c0d6a 100644
--- a/aircraft/f104/Makefile.am
+++ b/aircraft/f104/Makefile.am
@@ -2,4 +2,4 @@ aircraft_f104dir = ${pkgdatadir}/aircraft/f104
aircraft_f104_DATA = \
INSTALL \
f104.xml
-EXTRA_DIST=$(aircraft_f104_data)
+EXTRA_DIST=$(aircraft_f104_DATA)
diff --git a/aircraft/f15/Makefile.am b/aircraft/f15/Makefile.am
index 151c1de..fb714ca 100644
--- a/aircraft/f15/Makefile.am
+++ b/aircraft/f15/Makefile.am
@@ -2,4 +2,4 @@ aircraft_f15dir = ${pkgdatadir}/aircraft/f15
aircraft_f15_DATA = \
f15.xml \
INSTALL
-EXTRA_DIST=$(aircraft_f15_data)
+EXTRA_DIST=$(aircraft_f15_DATA)
diff --git a/aircraft/f16/Makefile.am b/aircraft/f16/Makefile.am
index cd6abc4..7417160 100644
--- a/aircraft/f16/Makefile.am
+++ b/aircraft/f16/Makefile.am
@@ -5,4 +5,4 @@ aircraft_f16_DATA = \
f16.xml \
reset00.xml \
README
-EXTRA_DIST=$(aircraft_f16_data)
+EXTRA_DIST=$(aircraft_f16_DATA)
diff --git a/aircraft/f16/Systems/Makefile.am b/aircraft/f16/Systems/Makefile.am
index 83e7014..580f4d5 100644
--- a/aircraft/f16/Systems/Makefile.am
+++ b/aircraft/f16/Systems/Makefile.am
@@ -2,4 +2,4 @@ aircraft_f16_Systemsdir = ${pkgdatadir}/aircraft/f16/Systems
aircraft_f16_Systems_DATA = \
pushback.xml \
hook.xml
-EXTRA_DIST=$(aircraft_f16_Systems_data)
+EXTRA_DIST=$(aircraft_f16_Systems_DATA)
diff --git a/aircraft/f22/Makefile.am b/aircraft/f22/Makefile.am
index 5d2f2c3..3bf4c6b 100644
--- a/aircraft/f22/Makefile.am
+++ b/aircraft/f22/Makefile.am
@@ -3,4 +3,4 @@ aircraft_f22_DATA = \
f22.xml \
yf22.xml \
README
-EXTRA_DIST=$(aircraft_f22_data)
+EXTRA_DIST=$(aircraft_f22_DATA)
diff --git a/aircraft/fokker100/Makefile.am b/aircraft/fokker100/Makefile.am
index 6f13a76..9aa9a24 100644
--- a/aircraft/fokker100/Makefile.am
+++ b/aircraft/fokker100/Makefile.am
@@ -5,4 +5,4 @@ aircraft_fokker100_DATA = \
xf100.xml \
fokker100.xml \
fokker70.xml
-EXTRA_DIST=$(aircraft_fokker100_data)
+EXTRA_DIST=$(aircraft_fokker100_DATA)
diff --git a/aircraft/fokker100/Systems/Makefile.am b/aircraft/fokker100/Systems/Makefile.am
index 55149be..8cee319 100644
--- a/aircraft/fokker100/Systems/Makefile.am
+++ b/aircraft/fokker100/Systems/Makefile.am
@@ -1,4 +1,4 @@
aircraft_fokker100_Systemsdir = ${pkgdatadir}/aircraft/fokker100/Systems
aircraft_fokker100_Systems_DATA = \
pushback.xml
-EXTRA_DIST=$(aircraft_fokker100_Systems_data)
+EXTRA_DIST=$(aircraft_fokker100_Systems_DATA)
diff --git a/aircraft/fokker50/Makefile.am b/aircraft/fokker50/Makefile.am
index 7056353..992cb57 100644
--- a/aircraft/fokker50/Makefile.am
+++ b/aircraft/fokker50/Makefile.am
@@ -1,4 +1,4 @@
aircraft_fokker50dir = ${pkgdatadir}/aircraft/fokker50
aircraft_fokker50_DATA = \
fokker50.xml
-EXTRA_DIST=$(aircraft_fokker50_data)
+EXTRA_DIST=$(aircraft_fokker50_DATA)
diff --git a/aircraft/minisgs/Makefile.am b/aircraft/minisgs/Makefile.am
index 60c643a..04464f5 100644
--- a/aircraft/minisgs/Makefile.am
+++ b/aircraft/minisgs/Makefile.am
@@ -3,4 +3,4 @@ aircraft_minisgs_DATA = \
INSTALL \
reset00.xml \
minisgs.xml
-EXTRA_DIST=$(aircraft_minisgs_data)
+EXTRA_DIST=$(aircraft_minisgs_DATA)
diff --git a/aircraft/mk82/Makefile.am b/aircraft/mk82/Makefile.am
index 5be988d..9189a68 100644
--- a/aircraft/mk82/Makefile.am
+++ b/aircraft/mk82/Makefile.am
@@ -4,4 +4,4 @@ aircraft_mk82_DATA = \
reset00.xml \
mk82.xml \
reset01.xml
-EXTRA_DIST=$(aircraft_mk82_data)
+EXTRA_DIST=$(aircraft_mk82_DATA)
diff --git a/aircraft/p51d/Engines/Makefile.am b/aircraft/p51d/Engines/Makefile.am
index 707b9cb..e900d3d 100644
--- a/aircraft/p51d/Engines/Makefile.am
+++ b/aircraft/p51d/Engines/Makefile.am
@@ -2,4 +2,4 @@ aircraft_p51d_Enginesdir = ${pkgdatadir}/aircraft/p51d/Engines
aircraft_p51d_Engines_DATA = \
Packard-V-1650-7.xml \
P51prop.xml
-EXTRA_DIST=$(aircraft_p51d_Engines_data)
+EXTRA_DIST=$(aircraft_p51d_Engines_DATA)
diff --git a/aircraft/p51d/Makefile.am b/aircraft/p51d/Makefile.am
index 1e326c2..4a72f53 100644
--- a/aircraft/p51d/Makefile.am
+++ b/aircraft/p51d/Makefile.am
@@ -5,4 +5,4 @@ aircraft_p51ddir = ${pkgdatadir}/aircraft/p51d
aircraft_p51d_DATA = \
INSTALL \
p51d.xml
-EXTRA_DIST=$(aircraft_p51d_data)
+EXTRA_DIST=$(aircraft_p51d_DATA)
diff --git a/aircraft/p51d/Systems/Makefile.am b/aircraft/p51d/Systems/Makefile.am
index 3fe5dc6..85d6716 100644
--- a/aircraft/p51d/Systems/Makefile.am
+++ b/aircraft/p51d/Systems/Makefile.am
@@ -8,4 +8,4 @@ aircraft_p51d_Systems_DATA = \
crash-detect.xml \
autothrottle.xml \
weapons-weight.xml
-EXTRA_DIST=$(aircraft_p51d_Systems_data)
+EXTRA_DIST=$(aircraft_p51d_Systems_DATA)
diff --git a/aircraft/pa28/Makefile.am b/aircraft/pa28/Makefile.am
index 0797e57..15e8551 100644
--- a/aircraft/pa28/Makefile.am
+++ b/aircraft/pa28/Makefile.am
@@ -3,4 +3,4 @@ aircraft_pa28_DATA = \
INSTALL \
reset00.xml \
pa28.xml
-EXTRA_DIST=$(aircraft_pa28_data)
+EXTRA_DIST=$(aircraft_pa28_DATA)
diff --git a/aircraft/paraglider/Makefile.am b/aircraft/paraglider/Makefile.am
index fb3555b..2d150d7 100644
--- a/aircraft/paraglider/Makefile.am
+++ b/aircraft/paraglider/Makefile.am
@@ -1,4 +1,4 @@
aircraft_paragliderdir = ${pkgdatadir}/aircraft/paraglider
aircraft_paraglider_DATA = \
paraglider.xml
-EXTRA_DIST=$(aircraft_paraglider_data)
+EXTRA_DIST=$(aircraft_paraglider_DATA)
diff --git a/aircraft/pc7/Makefile.am b/aircraft/pc7/Makefile.am
index 0c84ae7..10e981b 100644
--- a/aircraft/pc7/Makefile.am
+++ b/aircraft/pc7/Makefile.am
@@ -1,4 +1,4 @@
aircraft_pc7dir = ${pkgdatadir}/aircraft/pc7
aircraft_pc7_DATA = \
pc7.xml
-EXTRA_DIST=$(aircraft_pc7_data)
+EXTRA_DIST=$(aircraft_pc7_DATA)
diff --git a/aircraft/pogo-jsbsim/Engines/Makefile.am b/aircraft/pogo-jsbsim/Engines/Makefile.am
index 03e5f3a..b04ba02 100644
--- a/aircraft/pogo-jsbsim/Engines/Makefile.am
+++ b/aircraft/pogo-jsbsim/Engines/Makefile.am
@@ -2,4 +2,4 @@ aircraft_pogo_jsbsim_Enginesdir = ${pkgdatadir}/aircraft/pogo_jsbsim/Engines
aircraft_pogo_jsbsim_Engines_DATA = \
Pogo_prop.xml \
YT40-A-16.xml
-EXTRA_DIST=$(aircraft_pogo_jsbsim_Engines_data)
+EXTRA_DIST=$(aircraft_pogo_jsbsim_Engines_DATA)
diff --git a/aircraft/pogo-jsbsim/Makefile.am b/aircraft/pogo-jsbsim/Makefile.am
index eae1a6a..08c58e8 100644
--- a/aircraft/pogo-jsbsim/Makefile.am
+++ b/aircraft/pogo-jsbsim/Makefile.am
@@ -5,4 +5,4 @@ aircraft_pogo_jsbsim_DATA = \
reset00.xml \
reset01.xml \
pogo-jsbsim.xml
-EXTRA_DIST=$(aircraft_pogo_jsbsim_data)
+EXTRA_DIST=$(aircraft_pogo_jsbsim_DATA)
diff --git a/aircraft/sgs126/Makefile.am b/aircraft/sgs126/Makefile.am
index 2c97d79..c5b095b 100644
--- a/aircraft/sgs126/Makefile.am
+++ b/aircraft/sgs126/Makefile.am
@@ -2,4 +2,4 @@ aircraft_sgs126dir = ${pkgdatadir}/aircraft/sgs126
aircraft_sgs126_DATA = \
INSTALL \
sgs126.xml
-EXTRA_DIST=$(aircraft_sgs126_data)
+EXTRA_DIST=$(aircraft_sgs126_DATA)
diff --git a/aircraft/sgs233/Makefile.am b/aircraft/sgs233/Makefile.am
index 8ac7e19..503c867 100644
--- a/aircraft/sgs233/Makefile.am
+++ b/aircraft/sgs233/Makefile.am
@@ -1,4 +1,4 @@
aircraft_sgs233dir = ${pkgdatadir}/aircraft/sgs233
aircraft_sgs233_DATA = \
sgs233.xml
-EXTRA_DIST=$(aircraft_sgs233_data)
+EXTRA_DIST=$(aircraft_sgs233_DATA)
diff --git a/aircraft/t6texan2/Makefile.am b/aircraft/t6texan2/Makefile.am
index cc9e233..9e4d5d3 100644
--- a/aircraft/t6texan2/Makefile.am
+++ b/aircraft/t6texan2/Makefile.am
@@ -2,4 +2,4 @@ aircraft_t6texan2dir = ${pkgdatadir}/aircraft/t6texan2
aircraft_t6texan2_DATA = \
t6texan2.xml \
INSTALL
-EXTRA_DIST=$(aircraft_t6texan2_data)
+EXTRA_DIST=$(aircraft_t6texan2_DATA)
diff --git a/aircraft/x24b/Makefile.am b/aircraft/x24b/Makefile.am
index 3cad17b..78b17dc 100644
--- a/aircraft/x24b/Makefile.am
+++ b/aircraft/x24b/Makefile.am
@@ -2,4 +2,4 @@ aircraft_x24bdir = ${pkgdatadir}/aircraft/x24b
aircraft_x24b_DATA = \
reset00.xml \
x24b.xml
-EXTRA_DIST=$(aircraft_x24b_data)
+EXTRA_DIST=$(aircraft_x24b_DATA)
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 3e5fc18..8f6a3fc 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -77,4 +77,4 @@ engine_DATA = \
CFM56_5.xml \
prop_75in2f.xml \
s64_rotor.xml
-EXTRA_DIST=$(engine_data)
+EXTRA_DIST=$(engine_DATA)
diff --git a/systems/Makefile.am b/systems/Makefile.am
index a2c4ef9..0567ec8 100644
--- a/systems/Makefile.am
+++ b/systems/Makefile.am
@@ -21,4 +21,4 @@ systems_DATA = \
refuel.xml \
GNCUtilities.xml \
holdback.xml
-EXTRA_DIST=$(systems_data)
+EXTRA_DIST=$(systems_DATA)
diff --git a/updateAutomake.sh b/updateAutomake.sh
index 4840d31..c344f7a 100755
--- a/updateAutomake.sh
+++ b/updateAutomake.sh
@@ -34,7 +34,7 @@ do
echo "${curname}_DATA = \\" >> Makefile.am
find . -maxdepth 1 -type f -regex $fileRegex | sed -e '/^\.$/d' \
-e 's:$: \\:g' -e 's:^\./:\t:g' -e '$s:\\::g' >> Makefile.am
- echo 'EXTRA_DIST=$('${curname}'_data)' >> Makefile.am
+ echo 'EXTRA_DIST=$('${curname}'_DATA)' >> Makefile.am
done
--
GitLab