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

Use correct install path for man pages #3077

Merged
merged 1 commit into from Nov 22, 2016

Conversation

Projects
None yet
2 participants
@pengi
Copy link
Contributor

pengi commented Aug 17, 2016

We're building in our build environment by using:

/opt/op5sys/qt4/bin/qmake PREFIX=/usr INSTALLBASE=/usr LIBDIR=/usr/lib64
make
make install INSTALL_ROOT=/path/to/temporary/directory

so we can then generate an rpm.

Since the install script is generated for man pages, this ends up /usr missing in the paths, since $INSTALLBASE isn't part of it.

It seems that INSTALLBASE should be treated as base dir in the installed system, INSTALL_ROOT is the temporary directory to install the files to before packing in an archive.


Changing INSTALL_ROOT, for example in a build environment, the man pages
was installed in an incorrectly (non-existing) path.

Use correct INSTALLBASE even for the genereated man page files.

Signed-off-by: Max Sikstrom max.sikstrom@op5.com

Use correct install path for man pages
Changing INSTALL_ROOT, for example in a build environment, the man pages
was installed in an incorrectly (non-existing) path.

Use correct INSTALLBASE even for the genereated man page files.

Signed-off-by: Max Sikstrom <max.sikstrom@op5.com>

@ashkulz ashkulz merged commit 40c6c14 into wkhtmltopdf:master Nov 22, 2016

@ashkulz

This comment has been minimized.

Copy link
Member

ashkulz commented Nov 22, 2016

Thanks for the contribution!

@ashkulz ashkulz added the Merged label Nov 22, 2016

@ashkulz ashkulz added this to the 0.12.4 milestone Nov 22, 2016

@ashkulz ashkulz referenced this pull request Nov 22, 2016

Closed

OS X and packaging fixes #3022

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.