Skip to content

Correct implementation of --disable-stdlib-manpages#9335

Merged
dra27 merged 1 commit intoocaml:trunkfrom
dra27:fix-stdlib-manpages
Apr 17, 2020
Merged

Correct implementation of --disable-stdlib-manpages#9335
dra27 merged 1 commit intoocaml:trunkfrom
dra27:fix-stdlib-manpages

Conversation

@dra27
Copy link
Copy Markdown
Member

@dra27 dra27 commented Feb 26, 2020

The implementation of #8835 was accidentally broken by #8837. I think this PR amends #8835 to work in the spirit of the change made in #8837 (which was to make the building of manpages explicit). It means that make -C ocamldoc all now never builds the manpages, which I think is OK? As things presently stand, I think the manpages target would have been being called twice.

cc @gasche

@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Feb 26, 2020

Note the difference between Travis Job 16730.2 for this PR and the recent 16723.2 for trunk.

Copy link
Copy Markdown
Member

@Octachron Octachron left a comment

Choose a reason for hiding this comment

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

This looks fine to me. @shindere , since this is related to the build system, do you want to have a look?

@gasche
Copy link
Copy Markdown
Member

gasche commented Mar 31, 2020

Ahem, apologies for dropping the ball on this one. I didn't do a full review, but it looks correct to me and I think you could merge.

(I was nervous about the assumption that WITH_OCAMLDOC is either "ocamldoc" or "", but it is correct with our current configure.ac and ocamltest/Makefile already depends on it anyway.)

@shindere
Copy link
Copy Markdown
Contributor

shindere commented Apr 2, 2020 via email

@dra27 dra27 force-pushed the fix-stdlib-manpages branch from db1104f to 9c5d7c1 Compare April 17, 2020 06:48
@dra27 dra27 merged commit 43c84d2 into ocaml:trunk Apr 17, 2020
@dra27 dra27 deleted the fix-stdlib-manpages branch April 17, 2020 09:17
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
dra27 added a commit to dra27/ocaml that referenced this pull request Aug 4, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
dra27 added a commit to dra27/ocaml that referenced this pull request Aug 4, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
dra27 added a commit to dra27/ocaml that referenced this pull request Aug 4, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
dra27 added a commit to dra27/ocaml that referenced this pull request Aug 4, 2024
Correct implementation of --disable-stdlib-manpages

(cherry picked from commit 43c84d2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants