diff options
| author | Michael Schubert <schu@schu.io> | 2012-07-16 12:41:30 +0200 |
|---|---|---|
| committer | Michael Schubert <schu@schu.io> | 2012-07-16 13:30:23 +0200 |
| commit | 77ace82d7ab60fad62a02d272a37d8c4891f59a3 (patch) | |
| tree | ea02a02bf6fded220253b989b186357cb4534f78 | |
| parent | d4b573513c511584ca7e7f1f9c7731d7349aa3f2 (diff) | |
| download | libgit2-77ace82d7ab60fad62a02d272a37d8c4891f59a3.tar.gz | |
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.
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | libgit2.pc.in | 2 | ||||
| -rw-r--r-- | packaging/rpm/libgit2.spec | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 6165ad678..ddc03f36b 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 a6e82b241..80e70c164 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 |