diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-15 17:48:35 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-17 16:12:32 +0100 |
| commit | 02a4efb23815d0ed2d600f6e0af0735c0388c696 (patch) | |
| tree | de8b7d141cace255dbf09b9258d463e73027e6a0 /gnu/packages/storage.scm | |
| parent | 7e148c20d275fc78d98f8ee3954490a0369039cf (diff) | |
| download | guix-patches-02a4efb23815d0ed2d600f6e0af0735c0388c696.tar guix-patches-02a4efb23815d0ed2d600f6e0af0735c0388c696.tar.gz | |
gnu: ceph: Install headers to the "lib" output.
The previous provision for this has been defunct since version 12.
* gnu/packages/storage.scm (ceph)[arguments]: Remove obsolete substitution in
favor of a configure flag.
Diffstat (limited to 'gnu/packages/storage.scm')
| -rw-r--r-- | gnu/packages/storage.scm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index ee74f94eaf..f394c218b5 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -93,6 +93,8 @@ (libdir (string-append lib "/lib"))) (list (string-append "-DCMAKE_INSTALL_PREFIX=" out) (string-append "-DCMAKE_INSTALL_LIBDIR=" libdir) + (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" + lib "/include") ;; We need both libdir and libdir/ceph in RUNPATH. (string-append "-DCMAKE_INSTALL_RPATH=" libdir ";" libdir "/ceph") @@ -127,11 +129,6 @@ (let ((out (assoc-ref outputs "out")) (lib (assoc-ref outputs "lib"))) - ;; Make header files follow the dynamic libraries. - (substitute* "src/include/CMakeLists.txt" - (("DESTINATION include") - (string-append "DESTINATION " lib "/include"))) - (substitute* "cmake/modules/Distutils.cmake" ;; Prevent creation of Python eggs. (("setup.py install") |