From 9fdcca5e9414940c337505cd9b8e2ebee4bd4849 Mon Sep 17 00:00:00 2001
From: Florent Rougon <f.rougon@free.fr>
Date: Thu, 5 Jan 2017 06:31:52 +0100
Subject: [PATCH] Revert relevant parts of
 f4d8d8c6a1ba2f83cfb5c3d28794534bc477b682

For the reasons of this reverting, see the thread at
<https://sourceforge.net/p/flightgear/mailman/flightgear-devel/thread/CAHtsj_eFdxLoXXoNq%3D3OKNRmyR6-FowFL97TASdQJx8N05Lmig%40mail.gmail.com/#msg35580548>,
including <https://sourceforge.net/p/flightgear/mailman/message/35584363/>,
<https://sourceforge.net/p/flightgear/mailman/message/35584803/> and
<https://sourceforge.net/p/flightgear/mailman/message/35585421/> (appearing
out-of-thread according to the SF mailing list archive).
---
 package/make-base-package.noarch.sh | 1 +
 src/Main/options.cxx                | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/make-base-package.noarch.sh b/package/make-base-package.noarch.sh
index 3dc0e2cf0..53677329c 100755
--- a/package/make-base-package.noarch.sh
+++ b/package/make-base-package.noarch.sh
@@ -78,6 +78,7 @@ tar \
 		data/Models \
 		data/MP \
 		data/N* \
+		data/options.xml \
 		data/preferences.xml \
 		data/Protocol \
 		data/README \
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index d4e92abf8..851d63a43 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -322,8 +322,7 @@ private:
 
     int getNumMaturity(const char * str)
     {
-        // Changes should also be reflected in
-        // $FG_INSTALL_PREFIX/share/flightgear/options.xml.
+        // Changes should also be reflected in $FG_ROOT/options.xml
         const char* levels[] = {"alpha","beta","early-production","production"};
 
         if (!strcmp(str, "all")) {