From 427a421ec545cd186ee19e508fb4df3580322691 Mon Sep 17 00:00:00 2001 From: toddouska Date: Tue, 6 Aug 2013 11:29:37 -0700 Subject: [PATCH] fix rpm with .pc install, from Brian --- .gitignore | 2 +- Makefile.am | 2 ++ configure.ac | 2 +- rpm/spec.in | 1 + support/{libcyassl.pc.in => cyassl.pc.in} | 0 support/include.am | 4 +++- 6 files changed, 8 insertions(+), 3 deletions(-) rename support/{libcyassl.pc.in => cyassl.pc.in} (100%) diff --git a/.gitignore b/.gitignore index c93a89b30..19812f6fc 100644 --- a/.gitignore +++ b/.gitignore @@ -68,7 +68,7 @@ cyassl*rc* autoscan.log TAGS .DS_Store -support/libcyassl.pc +support/cyassl.pc cyassl/ctaocrypt/stamp-h1 swig/_cyassl.so swig/cyassl.py diff --git a/Makefile.am b/Makefile.am index 91256b684..651b60afb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,6 +46,7 @@ include doc/include.am include swig/include.am include src/include.am +include support/include.am include ctaocrypt/benchmark/include.am include ctaocrypt/src/include.am include ctaocrypt/test/include.am @@ -100,6 +101,7 @@ maintainer-clean-local: -rm m4/ltsugar.m4 -rm m4/ltversion.m4 -rm m4/lt~obsolete.m4 + -rm support/cyassl.pc find . -type f -name '*~' -exec rm -f '{}' \; -rm -f @PACKAGE@-*.tar.gz -rm -f @PACKAGE@-*.rpm diff --git a/configure.ac b/configure.ac index 95088eed2..04889c524 100644 --- a/configure.ac +++ b/configure.ac @@ -1366,7 +1366,7 @@ AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([cyassl/version.h]) AC_CONFIG_FILES([cyassl/options.h]) -AC_CONFIG_FILES([support/libcyassl.pc]) +AC_CONFIG_FILES([support/cyassl.pc]) AC_CONFIG_FILES([rpm/spec]) AX_CREATE_GENERIC_CONFIG diff --git a/rpm/spec.in b/rpm/spec.in index 65449f36c..a3a79798b 100644 --- a/rpm/spec.in +++ b/rpm/spec.in @@ -149,6 +149,7 @@ mkdir -p $RPM_BUILD_ROOT/ %{_includedir}/cyassl/ssl.h %{_includedir}/cyassl/test.h %{_includedir}/cyassl/version.h +%{_libdir}/pkgconfig/cyassl.pc %changelog * Fri Oct 20 2012 Brian Aker - 0.1-1 diff --git a/support/libcyassl.pc.in b/support/cyassl.pc.in similarity index 100% rename from support/libcyassl.pc.in rename to support/cyassl.pc.in diff --git a/support/include.am b/support/include.am index a273632e3..b0b4e494e 100644 --- a/support/include.am +++ b/support/include.am @@ -2,7 +2,9 @@ # All paths should be given relative to the root # +EXTRA_DIST += support/cyassl.pc + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = support/libcyassl.pc +pkgconfig_DATA = support/cyassl.pc