Index: GNUmakefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/pl/plperl/GNUmakefile,v
retrieving revision 1.14
diff -c -r1.14 GNUmakefile
*** GNUmakefile	5 Jul 2004 23:24:12 -0000	1.14
--- GNUmakefile	14 Jul 2004 19:41:46 -0000
***************
*** 8,13 ****
--- 8,16 ----
  ifeq ($(perl_useshrplib),true)
  shared_libperl = yes
  endif
+ ifeq ($(perl_useshrplib),yes)
+ shared_libperl = yes
+ endif

  # If we don't have a shared library and the platform doesn't allow it
  # to work without, we have to skip it.
***************
*** 18,24 ****
  override CFLAGS := $(filter-out -Wall -Wmissing-declarations -Wmissing-prototypes, $(CFLAGS))
  endif

! override CPPFLAGS := -I$(srcdir) -I$(perl_archlibexp)/CORE $(CPPFLAGS)


  NAME = plperl
--- 21,36 ----
  override CFLAGS := $(filter-out -Wall -Wmissing-declarations -Wmissing-prototypes, $(CFLAGS))
  endif

! ifeq ($(PORTNAME), win32)
! xperl_archlibexp=$(subst \,/,$(perl_archlibexp))
! xperl_privlibexp=$(subst \,/,$(perl_privlibexp))
! perl_embed_ldflags=-L $(xperl_archlibexp)/CORE -lperl58
! else
! xperl_archlibexp=$(perl_archlibxep)
! xperl_privlibexp=$(perl_privlibexp)
! endif
!
! override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -I$(xperl_archlibexp)/CORE


  NAME = plperl
***************
*** 35,41 ****
  all: all-lib

  SPI.c: SPI.xs
! 	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@

  install: all installdirs
  ifeq ($(enable_shared), yes)
--- 47,53 ----
  all: all-lib

  SPI.c: SPI.xs
! 	$(PERL) $(xperl_privlibexp)/ExtUtils/xsubpp -typemap $(xperl_privlibexp)/ExtUtils/typemap $< >$@

  install: all installdirs
  ifeq ($(enable_shared), yes)