Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow setting --docdir #36360

Merged
merged 1 commit into from
Sep 12, 2016
Merged

Allow setting --docdir #36360

merged 1 commit into from
Sep 12, 2016

Conversation

orbea
Copy link

@orbea orbea commented Sep 9, 2016

This will allow setting --docdir during configure, this is useful because not all linux distributions install documentation to /usr/share/doc. For example in Slackware documentation is installed to /usr/doc/$PRGNAM-$VERSION and /usr/share/doc is a symlink to /usr/doc.

To use this ./configure --docdir=/usr/doc/$PRGNAM-$VERSION can be used.

@orbea orbea mentioned this pull request Sep 9, 2016
Closed
@alexcrichton
Copy link
Member

@bors: r+ 5e9149d

Thanks!

@Manishearth Manishearth mentioned this pull request Sep 10, 2016
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 10, 2016
@Manishearth
Rollup merge of rust-lang#36360 - orbea:docdir, r=alexcrichton
c5f99e7 
Allow setting --docdir

This will allow setting `--docdir` during configure, this is useful because not all linux distributions install documentation to `/usr/share/doc`.  For example in Slackware documentation is installed to `/usr/doc/$PRGNAM-$VERSION` and `/usr/share/doc` is a symlink to `/usr/doc`.

To use this `./configure --docdir=/usr/doc/$PRGNAM-$VERSION` can be used.
@bors
Copy link
Contributor

bors commented Sep 10, 2016

⌛ Testing commit 5e9149d with merge 8c0b78c...

@bors
Copy link
Contributor

bors commented Sep 11, 2016

💔 Test failed - auto-win-msvc-64-cargotest

@orbea
Copy link
Author

orbea commented Sep 11, 2016

I don't have any way to test windows so I can't really do much about this.

@alexcrichton
Copy link
Member

@bors: retry

Ah I think that's a spurious failure

On Sat, Sep 10, 2016 at 6:15 PM, orbea [email protected] wrote:

I don't have any way to test windows so I can't really do much about this.

—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub
#36360 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95MyFgZLR_hp3iQgh2ZZqwTYY5Hj8ks5qo1YkgaJpZM4J4vMZ
.

@bors
Copy link
Contributor

bors commented Sep 12, 2016

⌛ Testing commit 5e9149d with merge 00ce2c0...

bors added a commit that referenced this pull request Sep 12, 2016
@bors
Auto merge of #36360 - orbea:docdir, r=alexcrichton
00ce2c0 
Allow setting --docdir

This will allow setting `--docdir` during configure, this is useful because not all linux distributions install documentation to `/usr/share/doc`.  For example in Slackware documentation is installed to `/usr/doc/$PRGNAM-$VERSION` and `/usr/share/doc` is a symlink to `/usr/doc`.

To use this `./configure --docdir=/usr/doc/$PRGNAM-$VERSION` can be used.
@bors
Copy link
Contributor

bors commented Sep 12, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: alexcrichton
Pushing 00ce2c0 to master...

@bors bors merged commit 5e9149d into rust-lang:master Sep 12, 2016
@cesarb
Copy link
Contributor

cesarb commented Sep 13, 2016

This caused a regression: #36451 (why didn't bors notice before merging?)

@ncihnegn ncihnegn mentioned this pull request Sep 15, 2016
Open
ncihnegn
ncihnegn reviewed Sep 15, 2016
View reviewed changes
Copy link

@ncihnegn ncihnegn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't just copy the string from mandir.

valopt_nosave mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
+valopt_nosave docdir "${CFG_PREFIX}/share/doc/rust" "install man pages in PATH"

@orbea
Copy link
Author

orbea commented Sep 15, 2016

Oops, I'm not sure how I missed that either. Thanks for pointing it out, I hope this should fix it?

#36500

@alexcrichton alexcrichton mentioned this pull request Sep 27, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncihnegn ncihnegn ncihnegn left review comments

Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@orbea @alexcrichton @bors @cesarb @ncihnegn