Re: pg_config - Mailing list pgsql-patches

OK, addition made, and I added documentation for -pgxs.

---------------------------------------------------------------------------

Andrew Dunstan wrote:
>
>
> Peter Eisentraut wrote:
>
> >Bruce Momjian wrote:
> >
> >
> >>Oops, sorry, done.
> >>
> >>
> >
> >The --pgxs option seems to have gotten lost in the conversion.
> >
> >
> >
>
> It wasn't there when I did the conversion. Usual problem of duelling
> patches. Can you fix it, or do you need me to send in a patch?
>
> cheers
>
> andrew
>

--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073
Index: doc/src/sgml/ref/pg_config-ref.sgml
===================================================================
RCS file: /cvsroot/pgsql-server/doc/src/sgml/ref/pg_config-ref.sgml,v
retrieving revision 1.17
diff -c -c -r1.17 pg_config-ref.sgml
*** doc/src/sgml/ref/pg_config-ref.sgml    29 Nov 2003 19:51:39 -0000    1.17
--- doc/src/sgml/ref/pg_config-ref.sgml    2 Aug 2004 12:31:43 -0000
***************
*** 25,30 ****
--- 25,31 ----
      <arg>--includedir-server</arg>
      <arg>--libdir</arg>
      <arg>--pkglibdir</arg>
+     <arg>--pgxs</arg>
      <arg>--configure</arg>
      <arg>--version</arg>
     </group>
***************
*** 101,106 ****
--- 102,116 ----
      </varlistentry>

      <varlistentry>
+      <term><option>--pgxs</option></>
+      <listitem>
+       <para>
+        Print the location of extension makefiles.
+      </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
       <term><option>--configure</option></>
       <listitem>
        <para>
Index: src/bin/pg_config/pg_config.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/bin/pg_config/pg_config.c,v
retrieving revision 1.2
diff -c -c -r1.2 pg_config.c
*** src/bin/pg_config/pg_config.c    1 Aug 2004 14:01:36 -0000    1.2
--- src/bin/pg_config/pg_config.c    2 Aug 2004 12:31:48 -0000
***************
*** 43,48 ****
--- 43,49 ----
      printf(_("  --includedir-server   show location of C header files for the server\n"));
      printf(_("  --libdir              show location of object code libraries\n"));
      printf(_("  --pkglibdir           show location of dynamically loadable modules\n"));
+     printf(_("  --pgxs                show location of extension makefile\n"));
      printf(_("  --configure           show options given to 'configure' script when\n"));
      printf(_("                        PostgreSQL was built\n"));
      printf(_("  --version             show the PostgreSQL version, then exit\n"));
***************
*** 81,86 ****
--- 82,88 ----
              strcmp(argv[i],"--includedir-server") == 0 ||
              strcmp(argv[i],"--libdir") == 0 ||
              strcmp(argv[i],"--pkglibdir") == 0 ||
+             strcmp(argv[i],"--pgxs") == 0 ||
              strcmp(argv[i],"--configure") == 0)
          {
              /* come back to these later */
***************
*** 136,141 ****
--- 138,148 ----
              get_lib_path(mypath,otherpath);
          else if (strcmp(argv[i],"--pkglibdir") == 0)
              get_pkglib_path(mypath,otherpath);
+         else if (strcmp(argv[i],"--pgxs") == 0)
+         {
+             get_pkglib_path(mypath,otherpath);
+             strncat(otherpath, "/pgxs", MAXPGPATH-1);
+         }

          printf("%s\n",otherpath);
      }