diff --git a/Makefile.am b/Makefile.am
index 2e45b6e8edb3817699d3418e7d5f44f406f7a378..38217504b99b8135221864a56edc10ac2f44bc1c 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 c474b5ad6986c52b6acf67d21971db49b58c70b6..61f7c77c1a9dcec27e61e7bfbd707b18a4c08c90 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 af902fe7db317e7bdd9dcbd1e0bf5b8993341d42..ac30ab6af051b51b74562d8ddd60b71cbc72e093 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 2ba7b5c793f58b261501f8cdbd56a97b8b571286..67dfb5029a2175ebc756e4f8e6464ba4039bf384 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 6632f03c874758b5da5f838fb8a2190988501df6..80c1dc946585bc9029182076d9880fcd53663917 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 ea4626972f3eaf6fcbabc44c68291a692e85d5e6..5ec12ae45442f688a61ab9b3d3cce2d0f8cf6a80 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 84997d7cd6dcf8f0cd666d9e26c39a4df2f9cc71..2b52339e200fdce1790ec1437a7475caf5b8c22c 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 122ff5eb4da1bccb877b592f8e1f2607a0e18350..cc49a3620b47e0c2eb522f04f6682975bde55097 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 386c315e02b70df1a65472f84bc5c3b98683524b..3839a33f7680591b0700cba24e4d948fb2757bc6 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 7a5cabdaffbde5144ba69a70b7c73c4fc795baf0..93fba793b3c0ce1e31d6d22039f5615952bc60f2 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 cd7aae2d1998c2ba48a9338c9336975b4a87fa99..18edb36778f964b6a42598754a6b7f03d0423a73 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 858b1dfbf075669fb41cd7ffa8467e08993cc584..f044efab0f4a567dfe7c77f11e4aed0b8071bdec 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 49db6ef3a6c9823f53266015af48c1b91c02f851..56edc37cc55a7374e03cb8fbe2621bad461fc633 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 76f5ab2598c31584f041646add2613828988c40d..b67a6442b49f61144c1687b249a0d84cead6a22b 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 ecb2b7370aaecdc5155a7fffba9df14c49c98648..975d1a7578fdbe09d3100ea3789d2c22a354b2d5 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 7e3fe58ccb04e71d65262257f531491bc057bf42..8a46de4986944639a5bcc60e86a9f85e192a7f67 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 d46d869d4fb5173999d00d3720f282d43bc06b79..50cd887eeaf4e3ea8da8e12312399835774af281 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 75380c8b62dd237b612c45c7a4909bba8410d185..9776bca25bc0ff130745db8da9b579a61c979e7c 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 44f07e1d3cdb89736c9f6c054c4aece0e501b19e..654b69bdc7b2a81bb2e17b905665c7719e6f2f71 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 0ffb334f686d218775cfc6bafc2e80e56e3861af..9b7f17f1cd72b94874f95b30b7397e658eef1e24 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 e9d297a62fb15f87325b922306944fb99413d000..3d9f1b73928c6ebcd3f0db23630c218ab61ef25f 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 70ebc9106b38398f9bd1d49ff7a71159bf064e7e..614720f1b8f417baf0ae8a9f58e3813c9a40013d 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 3dfc2b8df2a9d8a1c1d13bbed4fb7c8f6c3dcf59..1a860dd3c6228ebf6dfde3af16feb11c5146ad59 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 c68ac8c0e0c70383a8a44c5e0c74e44053e4674d..097565a169e28f467f7dce447a736cfc1b3c2f78 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 dcdea201080b476c56c8e2b0d20801a87e2fbad8..965c9fce6adb3d18e0ac327c6a7a806e1e00ccad 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 e022da3f676097368c87569b13053e8a7368ac51..febabf5c6c30079ec425fab4b1f18321dcf0a1d2 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 e7454f3dabd944255fc25c017c7b225ee16ea890..eac0b19a1ad04cc3db1efb6d9ba40a5a6cb1bee2 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 65c8f7d8a60465ef4096a9212f954805a0b833dc..cc2e7b1d27173291355fb8f59b20f1356f4cc932 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 5deb1448a3005b18ef0f83cad0ade94e063636c7..bce2640deb3791b08e1ed970b8d9907b601a4a89 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 53fab1d5d0713f7e4af1205cc5203bbfe7422c68..b4cfaf090f22bf4933b26125b1df7aef1b3bcb87 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 6eec7eb3f47b31b6bd57918fe02a9ea7f071adc0..cef7181d828f13a538aa4a4e65b64accbc9174a7 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 9b9da6e39987fb3976a533d3dbea73f9016a1262..6a9e34db168895bc6ff3baf7a4dbe5903d1333c6 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 b6c8ea9caf40e6598f815fc1a1dff9c83f74d5ed..b148ec4ad384d20b9b8ced9d22bc40f65e90e7b4 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 c5727917ca84b72847ca61f19bbef13aa2f3e884..32c7f8f97f2fd2311cd1d476007afb5b0737df7a 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 5f084d651a572e14a14d2cd4e0d29fc7e38340d8..c88112280e2852a03c9ecd5cf0939c53061b8bed 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 1b77949866ffe221133db1f33302e9cbfc2f78b8..839abd3c5c5bb94421bbac2680708c79592a126a 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 37614a969ca13ce0a0f993b4d8bb9029c5b3d641..1d3f9dbff116af52da9f760425158c4a5c7a3494 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 d8556a390cdee903b32b4a63063129ed4b3dee97..4b47b1fe3ce85b8a0239b320f690092e452a1435 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 cdb6cdc6d62a948a2e78733f49184b9637e3145a..1b74b9d0988e6f395d11005333379acfc06fc0e9 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 c5cbd9214151bd3706bd4b9671da64e39b4fe449..c1948026f1495e68ea2b0c878687764c0a09b676 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 04a8eb4e98b797d22d2dc12b170a77f619fed5ec..1269b50123bd8452fea71cb8241146c48379ac27 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 df3a5a76423dfc2efbdef799e4c24f4c81ef06d7..09a63b62690f7b39b074a9cf53e305ed4931f9b3 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 236626110c6823393067c2d7b131a8a446ca37c7..31c0d6a4511642609498c709eaa447a101566d72 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 151c1de9b95595df563a0a96adbceebf3b821136..fb714ca886260c0427bf7b68e6b070ba44fa8323 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 cd6abc441958a66c6fee4b95fc7bc9b030b5e30a..74171601fd5c5a5314db3b13950c7303dbb175c1 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 83e70147afc8f8a83ad0b66132a8c170287034e4..580f4d57e345873977d92d621b4ac1d7ba481efa 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 5d2f2c37b05bc2d5d8afc85ccf884f3c6e6dd28e..3bf4c6b8a8fd4374e70b515181ea31cd135e72cb 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 6f13a76dbacdf3561d39a7a2db4759925b9fc430..9aa9a24d92a82f41ecad48a6cb3940f1f094b966 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 55149be297d37e2a4a71f6db1f5cd8fb15a107f7..8cee3191dabe85ae3f1afce4c40a825ff6de5195 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 70563530c6512bd53dd7cc1eac0d38dfbf8ad89d..992cb5779a9e7e0f1101811f74b0808a003ae45b 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 60c643af6ee3561535fe9d36fa49dae1766785ec..04464f5d24600a50f0c010c6159f7333e33a3419 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 5be988d39bdb33a16d799582f7c8c725db9c3c0a..9189a68357960a17ebbd7824e88495fff1765d19 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 707b9cbf7a5ed5daf78aeaee17aaab7aba68386c..e900d3d56e68f5f72dd3f02b9da224dcd6f9e356 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 1e326c27b68b3f696f3d38fb5f52cb69cabff50e..4a72f535b2138ba7a9bf3bf978f3712199d15c33 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 3fe5dc613bfe9de2245d3d8ef8ad64e5b5dae311..85d6716ce7d1ff3284b27c3fbf28a35c582aca48 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 0797e57ba6871f4246468d591c62d74cfc4d8c53..15e85511e4b5a5b23ff9c3c0c63e5461845565a2 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 fb3555b4d930592f40e8dc283b4c14f191afba84..2d150d7685bcfc9c81f9a610a6fff54942c05d5f 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 0c84ae7769b79672b283e6364293937b399cb59c..10e981b93f70ec774c22bfb4e13159dc5c4d4927 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 03e5f3af26e8337e24368a58b823a1b8ec919188..b04ba02c42300a7b52c04dfd40cbd22851566490 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 eae1a6ad05dc89254569342702da97f79b7deb9f..08c58e8d7be31533ca0a25e3dff818ecc9c396b5 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 2c97d79f87d15a633aaf978143aca3882b029200..c5b095b504c6be1294d133ca5a1d7fdca9912689 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 8ac7e190282660284243a230747703787620d180..503c867329a0e3bcf7837c75944b4c2ef8a234ce 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 cc9e2338937da4b770e9b67b19eb12feeb324672..9e4d5d3a1b50126785f27fd808cd6eb6afaa76c3 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 3cad17b01ce4bac4462081d5257482525954ab72..78b17dc621258fc4178f4ae045a58cecce57d095 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 3e5fc1892064961dcc12b5148470ac274490959b..8f6a3fc18fee7676e73a9d3cd2dec3dc3d1950ce 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 a2c4ef90eb5d2668d1084a4ba631c99c9f3c6b3f..0567ec8b33aeeb558c4d34ebb566fb6832d99799 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 4840d316ad31b687d8c340c444480d1cf6a181fd..c344f7aa2f0103b0906ccf6eb4894e7e6dfc51b2 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