aspell-0.60.7-pspell_conf.patch 2.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566
  1. diff --git a/Makefile.in b/Makefile.in
  2. index e5d2b1a..bc53e34 100644
  3. --- a/Makefile.in
  4. +++ b/Makefile.in
  5. @@ -1019,6 +1019,8 @@ clean-filterLTLIBRARIES:
  6. install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  7. @$(NORMAL_INSTALL)
  8. @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
  9. + mkdir -p $(DESTDIR)$(libdir)/pkgconfig; \
  10. + cp aspell.pc $(DESTDIR)$(libdir)/pkgconfig/aspell.pc; \
  11. list2=; for p in $$list; do \
  12. if test -f $$p; then \
  13. list2="$$list2 $$p"; \
  14. diff --git a/aspell.pc.in b/aspell.pc.in
  15. new file mode 100644
  16. index 0000000..13da044
  17. --- /dev/null
  18. +++ b/aspell.pc.in
  19. @@ -0,0 +1,12 @@
  20. +prefix=@prefix@
  21. +exec_prefix=@exec_prefix@
  22. +libdir=@libdir@
  23. +includedir=@includedir@
  24. +pkgdatadir=@pkgdatadir@
  25. +
  26. +Name: Aspell
  27. +Description: A spelling checker.
  28. +Version: @VERSION@
  29. +Requires:
  30. +Libs: -L${libdir} -laspell
  31. +Cflags: -I${includedir}
  32. diff --git a/configure b/configure
  33. index 8a6e697..995a3df 100755
  34. --- a/configure
  35. +++ b/configure
  36. @@ -18732,7 +18732,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  37. # #
  38. # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
  39. -ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"
  40. +ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile aspell.pc scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"
  41. cat >confcache <<\_ACEOF
  42. # This file is a shell script that caches the results of configure
  43. @@ -19887,6 +19887,7 @@ do
  44. "modules/filter/Makefile") CONFIG_FILES="$CONFIG_FILES modules/filter/Makefile" ;;
  45. "myspell/Makefile") CONFIG_FILES="$CONFIG_FILES myspell/Makefile" ;;
  46. "lib5/Makefile") CONFIG_FILES="$CONFIG_FILES lib5/Makefile" ;;
  47. + "aspell.pc") CONFIG_FILES="$CONFIG_FILES aspell.pc" ;;
  48. *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  49. esac
  50. diff --git a/scripts/mkconfig b/scripts/mkconfig
  51. index 608e3f7..f15f31c 100755
  52. --- a/scripts/mkconfig
  53. +++ b/scripts/mkconfig
  54. @@ -15,7 +15,7 @@ case \$1 in
  55. echo "$2"
  56. ;;
  57. --pkgdatadir | pkgdatadir)
  58. - echo "$3"
  59. + pkg-config aspell --variable=pkgdatadir
  60. ;;
  61. *)
  62. echo "usage: pspell-config version|datadir|pkgdatadir"