diff -rc -x configure postgresql-8.0.0beta1/config/Makefile postgresql-8.0.0beta1-pkgconfig/config/Makefile *** postgresql-8.0.0beta1/config/Makefile Fri Jul 30 14:26:39 2004 --- postgresql-8.0.0beta1-pkgconfig/config/Makefile Sun Aug 22 19:29:39 2004 *************** *** 8,16 **** --- 8,20 ---- install: all installdirs $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(pgxsdir)/config/install-sh $(INSTALL_SCRIPT) $(srcdir)/mkinstalldirs $(DESTDIR)$(pgxsdir)/config/mkinstalldirs + $(INSTALL_DATA) $(srcdir)/postgresql.pc $(pkgconfigdir)/postgresql.pc installdirs: $(mkinstalldirs) $(DESTDIR)$(pgxsdir)/config uninstall: rm -f $(DESTDIR)$(pgxsdir)/config/install-sh $(DESTDIR)$(pgxsdir)/config/mkinstalldirs + + clean: + rm -f $(srcdir)/postgresql.pc Only in postgresql-8.0.0beta1-pkgconfig/config: postgresql.pc.in diff -rc -x configure postgresql-8.0.0beta1/configure.in postgresql-8.0.0beta1-pkgconfig/configure.in *** postgresql-8.0.0beta1/configure.in Mon Aug 9 01:27:11 2004 --- postgresql-8.0.0beta1-pkgconfig/configure.in Sun Aug 22 19:21:54 2004 *************** *** 382,387 **** --- 382,397 ---- PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh is in DIR]) + # Get the package directory for pkg-config, if not + # specified use the default, /usr/lib/pkgconfig + AC_MSG_CHECKING([pkg-config package directory]) + PGAC_ARG_REQ(with, pkgconfigdir, [ --with-pkgconfig-dir=DIR Use DIR for pkg-config package]) + if test "$with_pkgconfig_dir" == ""; then + with_pkgconfig_dir="/usr/lib/pkgconfig" + fi + AC_MSG_RESULT([$with_pkgconfig_dir]) + AC_SUBST(with_pkgconfig_dir) + # # Optionally build Perl modules (PL/Perl) # *************** *** 1250,1257 **** fi AC_SUBST(vpath_build) ! ! AC_CONFIG_FILES([GNUmakefile src/Makefile.global]) AC_CONFIG_LINKS([ src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c --- 1260,1266 ---- fi AC_SUBST(vpath_build) ! AC_CONFIG_FILES([GNUmakefile src/Makefile.global config/postgresql.pc]) AC_CONFIG_LINKS([ src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c Only in postgresql-8.0.0beta1-pkgconfig: configure.out diff -rc -x configure postgresql-8.0.0beta1/src/Makefile.global.in postgresql-8.0.0beta1-pkgconfig/src/Makefile.global.in *** postgresql-8.0.0beta1/src/Makefile.global.in Sun Aug 1 08:19:19 2004 --- postgresql-8.0.0beta1-pkgconfig/src/Makefile.global.in Sun Aug 22 18:26:00 2004 *************** *** 34,39 **** --- 34,40 ---- # Support for VPATH builds vpath_build = @vpath_build@ abs_top_srcdir = @abs_top_srcdir@ + pkgconfigdir = @with_pkgconfig_dir@ ifneq ($(vpath_build),yes) top_srcdir = $(top_builddir)