mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
72f681b771
ap/at-3.2.5-x86_64-1.txz: Upgraded. l/babl-0.1.106-x86_64-1.txz: Upgraded. l/libdiscid-0.6.4-x86_64-2.txz: Rebuilt. Patched to fix pkgconfig file. Thanks to ponce. tcl/tclx-8.6.1-x86_64-1.txz: Upgraded. x/libevdev-1.13.1-x86_64-1.txz: Upgraded. x/xcalc-1.1.2-x86_64-1.txz: Upgraded. testing/packages/gcc-13.1.0-x86_64-2.txz: Rebuilt. testing/packages/gcc-g++-13.1.0-x86_64-2.txz: Rebuilt. testing/packages/gcc-gdc-13.1.0-x86_64-2.txz: Rebuilt. testing/packages/gcc-gfortran-13.1.0-x86_64-2.txz: Rebuilt. testing/packages/gcc-gm2-13.1.0-x86_64-2.txz: Added. testing/packages/gcc-gnat-13.1.0-x86_64-2.txz: Rebuilt. testing/packages/gcc-go-13.1.0-x86_64-2.txz: Rebuilt. testing/packages/gcc-objc-13.1.0-x86_64-2.txz: Rebuilt.
28 lines
1 KiB
Diff
28 lines
1 KiB
Diff
From b89c14599fd8798eef64431bb05e8705aaaea683 Mon Sep 17 00:00:00 2001
|
|
From: Emanuel Haupt <ehaupt@critical.ch>
|
|
Date: Mon, 6 Mar 2023 10:42:33 +0100
|
|
Subject: [PATCH] Restore includedir and libdir
|
|
|
|
Restore includedir and libdir. This was removed some time between 0.6.2 and 0.6.3 [1] causing pkg-config --libs and --ldflags to report empty -I and -L paths.
|
|
|
|
[1] https://github.com/metabrainz/libdiscid/compare/v0.6.2...v0.6.3
|
|
|
|
See also:
|
|
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269990
|
|
---
|
|
CMakeLists.txt | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1f24916..911bf4a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -38,6 +38,8 @@ SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR} CACHE PATH "Installatio
|
|
SET(PACKAGE ${PROJECT_NAME})
|
|
SET(VERSION ${PROJECT_VERSION})
|
|
SET(PACKAGE_STRING "${PACKAGE} ${VERSION}")
|
|
+SET(includedir ${INCLUDE_INSTALL_DIR})
|
|
+SET(libdir ${LIB_INSTALL_DIR})
|
|
|
|
CONFIGURE_FILE(libdiscid.pc.in libdiscid.pc)
|
|
CONFIGURE_FILE(versioninfo.rc.in versioninfo.rc)
|