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.

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

darktable, wireshark: Fix documentation installation directory #83248

Closed
wants to merge 2 commits into from

Conversation

@rycee
Copy link
Member

rycee commented Mar 23, 2020

Fixes documentation directory. Before the documentation files for these packages would end up directly inside /share/doc and now they are placed in /share/doc/${pname}.

rycee added 2 commits Mar 23, 2020
Before the documentation files would end up directly under
`share/doc`.
Before the documentation files would end up directly under
`share/doc`.
@mrVanDalo
Copy link
Contributor

mrVanDalo commented Mar 24, 2020

looks like the better version of #72160

@bjornfor
Copy link
Contributor

bjornfor commented Mar 24, 2020

https://cmake.org/cmake/help/v3.16/module/GNUInstallDirs.html says CMAKE_INSTALL_DOCDIR defaults to DATAROOTDIR/doc/PROJECT_NAME. Don't these projects set project(NAME) in their CMakeLists.txt files? Ping upstream?

@bjornfor
Copy link
Contributor

bjornfor commented Mar 24, 2020

Ah, this is a workaround for #82304.

Copy link
Contributor

mrVanDalo left a comment

It shouldn't impact any functionality. I checked for documentation placement in wireguard and darktable. both look legit.

alyssais added a commit to alyssais/nixpkgs that referenced this pull request Jun 24, 2020
This reverts commit 730133e.

multiple-outputs.sh has been fixed, so documentation is now
corrrrectly installed under $out/share/doc/darktable.

Fixes: NixOS#72160
Fixes: NixOS#83248
alyssais added a commit that referenced this pull request Jun 29, 2020
This reverts commit 730133e.

multiple-outputs.sh has been fixed, so documentation is now
corrrrectly installed under $out/share/doc/darktable.

Fixes: #72160
Fixes: #83248
@rycee rycee closed this Jun 29, 2020
@rycee rycee deleted the rycee:fix-doc-dir branch Jun 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.