[commit: packages/Cabal] ghc-head: Documentation for --sysconfdir. (17e56d7)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=17e56d7358237ab5cdcf66a97dfd9483deefeb02

>---------------------------------------------------------------

commit 17e56d7358237ab5cdcf66a97dfd9483deefeb02
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Fri Aug 23 17:09:15 2013 +0200

    Documentation for --sysconfdir.


>---------------------------------------------------------------

17e56d7358237ab5cdcf66a97dfd9483deefeb02
 Cabal/doc/developing-packages.markdown |   14 +++++++-------
 Cabal/doc/installing-packages.markdown |   12 ++++++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Cabal/doc/developing-packages.markdown b/Cabal/doc/developing-packages.markdown
index af923ea..a02f796 100644
--- a/Cabal/doc/developing-packages.markdown
+++ b/Cabal/doc/developing-packages.markdown
@@ -1553,12 +1553,11 @@ a few options:
     `unregister`, `clean`, `dist` and `docs`. Some options to commands
     are passed through as follows:
 
-      * The `--with-hc-pkg`, `--prefix`, `--bindir`, `--libdir`,
-        `--datadir` and `--libexecdir` options to the `configure`
-        command are passed on to the `configure` script. In addition the
-        value of the `--with-compiler` option is passed in a `--with-hc`
-        option and all options specified with `--configure-option=` are
-        passed on.
+      * The `--with-hc-pkg`, `--prefix`, `--bindir`, `--libdir`, `--datadir`,
+        `--libexecdir` and `--sysconfdir` options to the `configure` command are
+        passed on to the `configure` script. In addition the value of the
+        `--with-compiler` option is passed in a `--with-hc` option and all
+        options specified with `--configure-option=` are passed on.
 
       * The `--destdir` option to the `copy` command becomes a setting
         of a `destdir` variable on the invocation of `make copy`. The
@@ -1571,7 +1570,8 @@ a few options:
                                 bindir=$(destdir)/$(bindir) \
                                 libdir=$(destdir)/$(libdir) \
                                 datadir=$(destdir)/$(datadir) \
-                                libexecdir=$(destdir)/$(libexecdir)
+                                libexecdir=$(destdir)/$(libexecdir) \
+                                sysconfdir=$(destdir)/$(sysconfdir) \
         ~~~~~~~~~~~~~~~~
 
   * You can write your own setup script conforming to the interface
diff --git a/Cabal/doc/installing-packages.markdown b/Cabal/doc/installing-packages.markdown
index 2f1defb..909644b 100644
--- a/Cabal/doc/installing-packages.markdown
+++ b/Cabal/doc/installing-packages.markdown
@@ -221,8 +221,8 @@ private file read by later stages.
 If a user-supplied `configure` script is run (see the section on
 [system-dependent parameters](#system-dependent-parameters) or on
 [complex packages](#complex-packages)), it is passed the
-`--with-hc-pkg`, `--prefix`, `--bindir`, `--libdir`, `--datadir` and
-`--libexecdir` options. In addition the value of the `--with-compiler`
+`--with-hc-pkg`, `--prefix`, `--bindir`, `--libdir`, `--datadir`, `--libexecdir`
+and `--sysconfdir` options. In addition the value of the `--with-compiler`
 option is passed in a `--with-hc` option and all options specified with
 `--configure-option=` are passed on.
 
@@ -327,6 +327,13 @@ package:
     variables: `$prefix`, `$bindir`, `$libdir`, `$libsubdir`, `$pkgid`, `$pkg`,
     `$version`, `$compiler`, `$os`, `$arch`
 
+`--sysconfdir=`_dir_
+:   Installation directory for the configuration files.
+
+    In the simple build system, _dir_ may contain the following path variables:
+    `$prefix`, `$bindir`, `$libdir`, `$libsubdir`, `$pkgid`, `$pkg`, `$version`,
+    `$compiler`, `$os`, `$arch`
+
 In addition the simple build system supports the following installation path options:
 
 `--libsubdir=`_dir_
@@ -446,6 +453,7 @@ Option                     Windows Default
 `--datadir` (library)      `C:\Program Files\Haskell`                                `$prefix/share`
 `--datasubdir`             `$pkgid`                                                  `$pkgid`
 `--docdir`                 `$prefix\doc\$pkgid`                                      `$datadir/doc/$pkgid`
+`--sysconfdir`             `$prefix\etc`                                             `$prefix/etc`
 `--htmldir`                `$docdir\html`                                            `$docdir/html`
 `--program-prefix`         (empty)                                                   (empty)
 `--program-suffix`         (empty)                                                   (empty)