Fix jsoncpp.pc file

fix libdir path

Change-Id: Id31dc946f1b391358c76994632381897adf76959

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index 91121c2..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,53 +0,0 @@
-/build/
-/build-*/
-*.pyc
-*.swp
-*.actual
-*.actual-rewrite
-*.process-output
-*.rewrite
-/bin/
-/libs/
-/doc/doxyfile
-/dist/
-
-# MSVC project files:
-*.sln
-*.vcxproj
-*.filters
-*.user
-*.sdf
-*.opensdf
-*.suo
-
-# MSVC build files:
-*.lib
-*.obj
-*.tlog/
-*.pdb
-
-# CMake-generated files:
-CMakeFiles/
-*.cmake
-/pkg-config/jsoncpp.pc
-jsoncpp_lib_static.dir/
-
-# In case someone runs cmake in the root-dir:
-/CMakeCache.txt
-/Makefile
-/include/Makefile
-/src/Makefile
-/src/jsontestrunner/Makefile
-/src/jsontestrunner/jsontestrunner_exe
-/src/lib_json/Makefile
-/src/test_lib_json/Makefile
-/src/test_lib_json/jsoncpp_test
-*.a
-
-# eclipse project files
-.project
-.cproject
-/.settings/
-
-# DS_Store
-.DS_Store

diff --git a/pkg-config/jsoncpp.pc.in b/pkg-config/jsoncpp.pc.in
index d4fa9ef..519e246 100644 (file)
--- a/pkg-config/jsoncpp.pc.in
+++ b/pkg-config/jsoncpp.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+libdir=@CMAKE_INSTALL_LIBDIR@
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
 Name: jsoncpp