Commit 77ace82d7ab60fad62a02d272a37d8c4891f59a3
2012-07-16T12:41:30
libgit2.pc.in: also switch to LIB_INSTALL_DIR b3237ac3 changed CMakeList.txt to use the more standard LIB_INSTALL_DIR variable instead of INSTALL_LIB, but forgot to change libgit2.pc.in etc. accordingly.
diff --git a/README.md b/README.md
index e8dc36a..0075e53 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ For more advanced use or questions about CMake please read <http://www.cmake.org
The following CMake variables are declared:
- `INSTALL_BIN`: Where to install binaries to.
-- `INSTALL_LIB`: Where to install libraries to.
+- `LIB_INSTALL_DIR`: Where to install libraries to.
- `INSTALL_INC`: Where to install headers to.
- `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON)
- `BUILD_CLAR`: Build [Clar](https://github.com/tanoku/clar)-based test suite (defaults to ON)
diff --git a/libgit2.pc.in b/libgit2.pc.in
index 6165ad6..ddc03f3 100644
--- a/libgit2.pc.in
+++ b/libgit2.pc.in
@@ -1,4 +1,4 @@
-libdir=@CMAKE_INSTALL_PREFIX@/@INSTALL_LIB@
+libdir=@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@
includedir=@CMAKE_INSTALL_PREFIX@/@INSTALL_INC@
Name: libgit2
diff --git a/packaging/rpm/libgit2.spec b/packaging/rpm/libgit2.spec
index a6e82b2..80e70c1 100644
--- a/packaging/rpm/libgit2.spec
+++ b/packaging/rpm/libgit2.spec
@@ -65,7 +65,7 @@ to compile and develop applications that use libgit2.
cmake . \
-DCMAKE_C_FLAGS:STRING="%{optflags}" \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
- -DINSTALL_LIB:PATH=%{_libdir}
+ -DLIB_INSTALL_DIR:PATH=%{_libdir}S
make %{?_smp_mflags}
%install