[packages/jsmn] add missing LIB_INSTALL_DIR
glen
glen at pld-linux.org
Sat Jan 2 00:18:51 CET 2016
commit 068a6604f8f58eabac430b644c0833a4ebcea382
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Jan 2 01:18:20 2016 +0200
add missing LIB_INSTALL_DIR
CMakeLists.txt | 4 +++-
jsmn.spec | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/jsmn.spec b/jsmn.spec
index f1da454..2c0deda 100644
--- a/jsmn.spec
+++ b/jsmn.spec
@@ -34,12 +34,14 @@ cp %{SOURCE1} .
rm Makefile
%build
-%cmake
+%cmake \
+ -DLIB_INSTALL_DIR=%{_libdir}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%cmake_install
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44d84e2..c5385ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,8 @@ SET_TARGET_PROPERTIES(jsmn
)
INSTALL(TARGETS jsmn
- LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ COMPONENT libraries
)
INSTALL(FILES jsmn.h DESTINATION include)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jsmn.git/commitdiff/068a6604f8f58eabac430b644c0833a4ebcea382
More information about the pld-cvs-commit
mailing list