Răsfoiți Sursa

fix rpm with .pc install, from Brian

toddouska 10 ani în urmă
părinte
comite
427a421ec5
6 a modificat fișierele cu 8 adăugiri și 3 ștergeri
  1. 1 1
      .gitignore
  2. 2 0
      Makefile.am
  3. 1 1
      configure.ac
  4. 1 0
      rpm/spec.in
  5. 0 0
      support/cyassl.pc.in
  6. 3 1
      support/include.am

+ 1 - 1
.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

+ 2 - 0
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

+ 1 - 1
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

+ 1 - 0
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 <brian@tangent.org> - 0.1-1

+ 0 - 0
support/libcyassl.pc.in → support/cyassl.pc.in


+ 3 - 1
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