Skip to content

Commit

Permalink
libgit2.pc.in: also switch to LIB_INSTALL_DIR
Browse files Browse the repository at this point in the history
b3237ac 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.
  • Loading branch information
schu committed Jul 16, 2012
1 parent d4b5735 commit 77ace82
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion libgit2.pc.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packaging/rpm/libgit2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 77ace82

Please sign in to comment.