apply patch from Giulio Paci

diff --git a/Makefile.am b/Makefile.am
index 2865fb7bee2c3fa8e58c2363e05da291058bf978..e0ca1c5da37e3553df371b8e7aa8e051faf897c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,21 @@ bin_SCRIPTS = onig-config
 
 onig-config: onig-config.in
 
+do_subst = sed                                          \
+      -e 's,[@]datadir[@],$(datadir),g'                 \
+      -e 's,[@]datarootdir[@],$(datarootdir),g'         \
+      -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
+      -e 's,[@]prefix[@],$(prefix),g'                   \
+      -e 's,[@]exec_prefix[@],$(exec_prefix),g'         \
+      -e 's,[@]libdir[@],$(libdir),g'                   \
+      -e 's,[@]includedir[@],$(includedir),g'
+
+oniguruma.pc: $(srcdir)/oniguruma.pc.in Makefile
+       $(do_subst) < $(<) > $(@)
+
+pkgconfigdir   = $(libdir)/pkgconfig
+pkgconfig_DATA = onig.pc
+
 dll:
        $(CXX) -shared -Wl,--output-def,libonig.def -o libonig.dll *.o \
        $(LIBS)

diff --git a/Makefile.in b/Makefile.in
index aea55504acf53a825417d0e1b950dce2f862a819..429de8315c1bed9c22f2d1629135a56e3870cb42 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,6 +17,7 @@
 
 
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -79,7 +80,7 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-       "$(DESTDIR)$(includedir)"
+       "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libonig_la_LIBADD =
 am_libonig_la_OBJECTS = regerror.lo regparse.lo regext.lo regcomp.lo \
@@ -133,6 +134,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        install-pdf-recursive install-ps-recursive install-recursive \
        installcheck-recursive installdirs-recursive pdf-recursive \
        ps-recursive uninstall-recursive
+DATA = $(pkgconfig_DATA)
 HEADERS = $(include_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
@@ -333,6 +335,17 @@ EXTRA_DIST = HISTORY README.ja index.html index_ja.html \
        $(sampledir)/syntax.c
 
 bin_SCRIPTS = onig-config
+do_subst = sed                                          \
+      -e 's,[@]datadir[@],$(datadir),g'                 \
+      -e 's,[@]datarootdir[@],$(datarootdir),g'         \
+      -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
+      -e 's,[@]prefix[@],$(prefix),g'                   \
+      -e 's,[@]exec_prefix[@],$(exec_prefix),g'         \
+      -e 's,[@]libdir[@],$(libdir),g'                   \
+      -e 's,[@]includedir[@],$(includedir),g'
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = onig.pc
 testc_SOURCES = testc.c
 testc_LDADD = libonig.la
 testp_SOURCES = testc.c
@@ -790,6 +803,26 @@ clean-libtool:
 
 distclean-libtool:
        -rm -f libtool config.lt
+install-pkgconfigDATA: $(pkgconfig_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+       @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+       done
+
+uninstall-pkgconfigDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
 install-includeHEADERS: $(include_HEADERS)
        @$(NORMAL_INSTALL)
        test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
@@ -1217,10 +1250,10 @@ check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
        $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS) config.h
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
@@ -1272,7 +1305,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-includeHEADERS
+install-data-am: install-includeHEADERS install-pkgconfigDATA
 
 install-dvi: install-dvi-recursive
 
@@ -1321,7 +1354,7 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binSCRIPTS uninstall-includeHEADERS \
-       uninstall-libLTLIBRARIES
+       uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
        ctags-recursive install-am install-strip tags-recursive
@@ -1339,17 +1372,20 @@ uninstall-am: uninstall-binSCRIPTS uninstall-includeHEADERS \
        install-exec-am install-html install-html-am \
        install-includeHEADERS install-info install-info-am \
        install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags tags-recursive uninstall uninstall-am \
+       install-pkgconfigDATA install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs installdirs-am \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+       pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
        uninstall-binSCRIPTS uninstall-includeHEADERS \
-       uninstall-libLTLIBRARIES
+       uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
 
 
 onig-config: onig-config.in
 
+oniguruma.pc: $(srcdir)/oniguruma.pc.in Makefile
+       $(do_subst) < $(<) > $(@)
+
 dll:
        $(CXX) -shared -Wl,--output-def,libonig.def -o libonig.dll *.o \
        $(LIBS)

diff --git a/oniguruma.pc.in b/oniguruma.pc.in
new file mode 100644 (file)
index 0000000..c392009
--- /dev/null
+++ b/oniguruma.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+
+Name: oniguruma
+Description: Regular expression library
+Version: @PACKAGE_VERSION@
+Requires:
+Libs: -L${libdir} -lonig
+Cflags:
+