diff options
| -rw-r--r-- | compiler/Makefile | 1 | ||||
| -rw-r--r-- | compiler/main/Main.hs | 9 | ||||
| -rw-r--r-- | docs/users_guide/flags.xml | 6 | ||||
| -rw-r--r-- | docs/users_guide/using.xml | 14 |
4 files changed, 0 insertions, 30 deletions
diff --git a/compiler/Makefile b/compiler/Makefile index 793cf6b007..9c8da7dc89 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -271,7 +271,6 @@ endif @echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) - @echo "cDocDir = \"$(docdir)\"" >> $(CONFIG_HS) ifeq "$(RelocatableBuild)" "YES" @echo "cRelocatableBuild = True" >> $(CONFIG_HS) else diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs index ad8d1f44c7..f96b085a69 100644 --- a/compiler/main/Main.hs +++ b/compiler/main/Main.hs @@ -171,7 +171,6 @@ main = ShowUsage -> showGhcUsage dflags cli_mode PrintLibdir -> putStrLn (topDir dflags) ShowSupportedLanguages -> alreadyHandled - ShowDocDir -> showDocDir (topDir dflags) ShowVersion -> alreadyHandled ShowNumVersion -> alreadyHandled ShowInterface f -> doShowIface dflags f @@ -306,7 +305,6 @@ verifyOutputFiles dflags = do data CmdLineMode = ShowUsage -- ghc -? | PrintLibdir -- ghc --print-libdir - | ShowDocDir -- ghc --print-docdir | ShowInfo -- ghc --info | ShowSupportedLanguages -- ghc --supported-languages | ShowVersion -- ghc -V/--version @@ -369,7 +367,6 @@ mode_flags = ( "?" , PassFlag (setMode ShowUsage)) , ( "-help" , PassFlag (setMode ShowUsage)) , ( "-print-libdir" , PassFlag (setMode PrintLibdir)) - , ( "-print-docdir" , PassFlag (setMode ShowDocDir)) , ( "V" , PassFlag (setMode ShowVersion)) , ( "-version" , PassFlag (setMode ShowVersion)) , ( "-numeric-version" , PassFlag (setMode ShowNumVersion)) @@ -475,12 +472,6 @@ showSupportedLanguages :: IO () showSupportedLanguages = do mapM_ putStrLn supportedLanguages exitWith ExitSuccess -showDocDir :: FilePath -> IO () -showDocDir topdir = putStrLn docDir - where docDir = if cRelocatableBuild - then topdir ++ "/doc" - else cDocDir - showVersion :: IO () showVersion = do putStrLn (cProjectName ++ ", version " ++ cProjectVersion) diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml index cb2cb1f2f7..b191a6c7f9 100644 --- a/docs/users_guide/flags.xml +++ b/docs/users_guide/flags.xml @@ -90,12 +90,6 @@ <entry>-</entry> </row> <row> - <entry><option>––print-docdir</option></entry> - <entry>display GHC documentation directory</entry> - <entry>mode</entry> - <entry>-</entry> - </row> - <row> <entry><option>-ferror-spans</option></entry> <entry>output full span in error messages</entry> <entry>static</entry> diff --git a/docs/users_guide/using.xml b/docs/users_guide/using.xml index b171ad3cb8..5e8be42a9d 100644 --- a/docs/users_guide/using.xml +++ b/docs/users_guide/using.xml @@ -422,20 +422,6 @@ module X where </listitem> </varlistentry> - <varlistentry> - <term> - <cmdsynopsis> - <command>ghc --print-docdir</command> - </cmdsynopsis> - <indexterm><primary><option>––print-docdir</option></primary></indexterm> - </term> - <listitem> - <para>Print the path to GHC's documentation directory. Note that - some distributions do no include the documentation, in which case - this directory may be empty or may not exist.</para> - </listitem> - </varlistentry> - </variablelist> <sect2 id="make-mode"> |