diff options
| author | Josh Stone <jistone@redhat.com> | 2017-10-26 16:30:17 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2017-10-26 17:23:14 -0700 |
| commit | 19714f55ee70f3130751c8f720b21d869bc82b5d (patch) | |
| tree | 83d56b1fd7876c566dd0752b08e91819139fd488 | |
| parent | 924331cc9b9213112e697833391c8d5fc59ea844 (diff) | |
config.toml: Add stubs for recognized-but-unused install paths
... specifically `datadir`, `infodir`, and `localstatedir`. These were already accepted by `configure.py`, but it didn't have any place to put the values.
| -rw-r--r-- | config.toml.example | 10 | ||||
| -rw-r--r-- | src/bootstrap/config.rs | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/config.toml.example b/config.toml.example index 261fe205387..df0142b8d46 100644 --- a/config.toml.example +++ b/config.toml.example @@ -203,6 +203,16 @@ # Where to install man pages in `prefix` above #mandir = "share/man" +# Where to install data in `prefix` above (currently unused) +#datadir = "share" + +# Where to install additional info in `prefix` above (currently unused) +#infodir = "share/info" + +# Where to install local state (currently unused) +# If this is a relative path, it will get installed in `prefix` above +#localstatedir = "/var/lib" + # ============================================================================= # Options for compiling Rust code itself # ============================================================================= diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 66e5efcea4e..33c7141e704 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -207,6 +207,11 @@ struct Install { bindir: Option<String>, libdir: Option<String>, mandir: Option<String>, + + // standard paths, currently unused + datadir: Option<String>, + infodir: Option<String>, + localstatedir: Option<String>, } /// TOML representation of how the LLVM build is configured. |