Index: src/pl/plperl/GNUmakefile
===================================================================
RCS file: /cvsroot/pgsql-server/src/pl/plperl/GNUmakefile,v
retrieving revision 1.14
diff -c -c -r1.14 GNUmakefile
*** src/pl/plperl/GNUmakefile	5 Jul 2004 23:24:12 -0000	1.14
--- src/pl/plperl/GNUmakefile	16 Jul 2004 19:16:57 -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,33 ----
  override CFLAGS := $(filter-out -Wall -Wmissing-declarations -Wmissing-prototypes, $(CFLAGS))
  endif
  
! ifeq ($(PORTNAME), win32)
! perl_archlibexp := $(subst \,/,$(perl_archlibexp))
! perl_privlibexp := $(subst \,/,$(perl_privlibexp))
! perl_embed_ldflags := -L $(perl_archlibexp)/CORE -lperl58
! endif
! 
! override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE
  
  
  NAME = plperl