diff options
| author | Andre Heinecke <[email protected]> | 2016-09-29 10:46:18 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-09-29 10:46:18 +0000 |
| commit | 7302791c0d308c3284ac24a743035d27a0c0b6ba (patch) | |
| tree | beca02c1fb6519901c788e59e4fe4cf31b9f24de /lang/cpp/src/Makefile.am | |
| parent | tests: Fix blunder. (diff) | |
| download | gpgme-7302791c0d308c3284ac24a743035d27a0c0b6ba.tar.gz gpgme-7302791c0d308c3284ac24a743035d27a0c0b6ba.zip | |
cpp, qt: Handle modified includedir installation
* lang/cpp/src/Makefile.am,
lang/qt/src/Makefile.am: Replace resolved_includedir.
* lang/cpp/src/GpgmeppConfig.cmake.in.in,
lang/qt/src/QGpgmeConfig.cmake.in.in: Use resolved_includedir
instead of relying on a common installation prefix.
--
This fixes usage of the config files in case gpgme
is configured with a custom --includedir.
We have to do the replacement manually like for libdir
because configure would include variables in the replacement.
Diffstat (limited to '')
| -rw-r--r-- | lang/cpp/src/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am index e65a8752..0500dbf6 100644 --- a/lang/cpp/src/Makefile.am +++ b/lang/cpp/src/Makefile.am @@ -76,9 +76,9 @@ libsuffix=.so endif GpgmeppConfig.cmake: GpgmeppConfig.cmake.in - sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" > "$@" - sed -e 's|[@]libsuffix@|$(libsuffix)|g' < "$@" > "$@".2 - mv "$@".2 "$@" + sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" | \ + sed -e 's|[@]libsuffix@|$(libsuffix)|g' | \ + sed -e 's|[@]resolved_includedir@|$(includedir)|g' > $@ install-cmake-files: GpgmeppConfig.cmake GpgmeppConfigVersion.cmake -$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/Gpgmepp |