From f381654277d5ee4fd0c3c743f970dcaf096fa796 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 24 Mar 2013 20:28:36 +0100 Subject: Pkg-config file changed back to "vmime.pc" (fixed issue #35). Do not break compatibility with previous releases. --- .gitignore | 2 +- CMakeLists.txt | 4 ++-- libvmime.pc.in | 13 ------------- vmime.pc.in | 13 +++++++++++++ 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 libvmime.pc.in create mode 100644 vmime.pc.in diff --git a/.gitignore b/.gitignore index 94f66b35..ddd45636 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ doc/html/* /Makefile /install_manifest* /libvmime.a -/libvmime.pc +/vmime.pc /vmime/config.hpp /COPYING.txt /build/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 40f15c74..2f246d74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -825,8 +825,8 @@ ENDIF() CONFIGURE_FILE(cmake/config.hpp.cmake ${CMAKE_SOURCE_DIR}/vmime/config.hpp) # PkgConfig post-configuration -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libvmime.pc.in ${CMAKE_BINARY_DIR}/libvmime.pc @ONLY) -INSTALL(FILES ${CMAKE_BINARY_DIR}/libvmime.pc DESTINATION "${VMIME_INSTALL_LIBDIR}/pkgconfig" COMPONENT headers) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/vmime.pc.in ${CMAKE_BINARY_DIR}/vmime.pc @ONLY) +INSTALL(FILES ${CMAKE_BINARY_DIR}/vmime.pc DESTINATION "${VMIME_INSTALL_LIBDIR}/pkgconfig" COMPONENT headers) INCLUDE(CPack) diff --git a/libvmime.pc.in b/libvmime.pc.in deleted file mode 100644 index fc1103ef..00000000 --- a/libvmime.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @VMIME_PACKAGE_NAME@ -Description: @VMIME_PACKAGE_DESCRIPTION@ -Version: @VMIME_PACKAGE_VERSION@ -Requires.private: @VMIME_PKGCONFIG_REQUIRES@ -Libs: -L${libdir} -l@VMIME_LIBRARY_NAME@ -Libs.private: @VMIME_PKGCONFIG_LIBS@ -Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@ - diff --git a/vmime.pc.in b/vmime.pc.in new file mode 100644 index 00000000..fc1103ef --- /dev/null +++ b/vmime.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @VMIME_PACKAGE_NAME@ +Description: @VMIME_PACKAGE_DESCRIPTION@ +Version: @VMIME_PACKAGE_VERSION@ +Requires.private: @VMIME_PKGCONFIG_REQUIRES@ +Libs: -L${libdir} -l@VMIME_LIBRARY_NAME@ +Libs.private: @VMIME_PKGCONFIG_LIBS@ +Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@ + -- cgit v1.2.3