Re: [HACKERS] pgxs/windows - Mailing list pgsql-patches

From Bruce Momjian
Subject Re: [HACKERS] pgxs/windows
Date
Msg-id 200601192045.k0JKjje15085@candle.pha.pa.us
Whole thread Raw
In response to Re: [HACKERS] pgxs/windows  (Tom Lane <tgl@sss.pgh.pa.us>)
Responses Re: [HACKERS] pgxs/windows  (Tom Lane <tgl@sss.pgh.pa.us>)
List pgsql-patches
Tom Lane wrote:
> Bruce Momjian <pgman@candle.pha.pa.us> writes:
> > The difference between Magnus's and Andrew's is
> > that Magnus used MODULE_big (which means create a shared library), while
> > Andrew used MODULES.  So, Magnus's only worked because he was creating a
> > DLL and that brought in the -L from MODULE_big.
>
> Ah, good catch.
>
> > I have applied the following patch to change /bin to /lib for Cygwin and
> > Win32.
>
> What about the question of whether $(DESTDIR) belongs there or not?
> I think we had concluded that PGXS shouldn't ever use $(DESTDIR),
> because that's only for install-time stuff.

I considered that a separate issue and didn't explore it, but I think
you are right that $(DESTDIR) makes no sense so I will remove it.

Patch attached.

--
  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: src/makefiles/Makefile.cygwin
===================================================================
RCS file: /cvsroot/pgsql/src/makefiles/Makefile.cygwin,v
retrieving revision 1.7
diff -c -c -r1.7 Makefile.cygwin
*** src/makefiles/Makefile.cygwin    19 Jan 2006 20:00:54 -0000    1.7
--- src/makefiles/Makefile.cygwin    19 Jan 2006 20:42:50 -0000
***************
*** 2,8 ****
  DLLTOOL= dlltool
  DLLWRAP= dllwrap
  ifdef PGXS
! BE_DLLLIBS= -L$(DESTDIR)$(libdir) -lpostgres
  else
  BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
  endif
--- 2,8 ----
  DLLTOOL= dlltool
  DLLWRAP= dllwrap
  ifdef PGXS
! BE_DLLLIBS= -L$(libdir) -lpostgres
  else
  BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
  endif
Index: src/makefiles/Makefile.win32
===================================================================
RCS file: /cvsroot/pgsql/src/makefiles/Makefile.win32,v
retrieving revision 1.8
diff -c -c -r1.8 Makefile.win32
*** src/makefiles/Makefile.win32    19 Jan 2006 20:00:54 -0000    1.8
--- src/makefiles/Makefile.win32    19 Jan 2006 20:42:50 -0000
***************
*** 6,12 ****
  DLLTOOL= dlltool
  DLLWRAP= dllwrap
  ifdef PGXS
! BE_DLLLIBS= -L$(DESTDIR)$(libdir) -lpostgres
  else
  BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
  endif
--- 6,12 ----
  DLLTOOL= dlltool
  DLLWRAP= dllwrap
  ifdef PGXS
! BE_DLLLIBS= -L$(libdir) -lpostgres
  else
  BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
  endif

pgsql-patches by date:

Previous
From: Tom Lane
Date:
Subject: Re: [HACKERS] pgxs/windows
Next
From: Tom Lane
Date:
Subject: Re: Uninstall scripts for contrib