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

Move headers to subdir of include/, install missing headers #36

Merged
merged 1 commit into from Nov 5, 2019

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented Oct 17, 2019

The install process currently installs only squashfuse.h and squashfs_fs.h, directly into PREFIX/include/.

Unfortunately, because the contents of squashfuse.h is only:

squashfuse/squashfuse.h

Lines 28 to 33 in 0b48352

#include "dir.h"
#include "file.h"
#include "fs.h"
#include "traverse.h"
#include "util.h"
#include "xattr.h"

it is useless without those other files, and the installation is broken (cannot be compiled against).

This PR adds all of the listed headers, plus any #included by those headers, to the pkgconfigdir_HEADERS list, and sets pkgconfigdir = @includedir@/squashfuse. This means that all of the necessary headers will be installed in PREFIX/include/squashfuse/ and they can be referenced at that path to build software that links against the library.

The squashfuse.pc.in file is also updated to point includedir to the new subdirectory. (There may be a more clever way of writing the .pc.in file that makes use of @pkgconfigdir@ directly, but I couldn't find a way to make that work. It just kept passing through the template processing unreplaced.)

@vasi vasi merged commit 1c4e50f into vasi:master Nov 5, 2019
@ferdnyc ferdnyc deleted the header-install branch November 5, 2019 14:29
@ferdnyc ferdnyc mentioned this pull request May 1, 2022
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.

None yet

2 participants