diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 10e62e65e486fdc8564f53a910c613a0c78aa548..873bf18acc2a99752e0c81120a4b6c4b539c2570 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -1,5 +1,5 @@
 # Makefile for PL/Perl
-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.14 2004/07/05 23:24:12 tgl Exp $
+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.15 2004/07/16 19:18:24 momjian Exp $
 
 subdir = src/pl/plperl
 top_builddir = ../../..
@@ -8,6 +8,9 @@ include $(top_builddir)/src/Makefile.global
 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,7 +21,13 @@ ifeq ($(GCC),yes)
 override CFLAGS := $(filter-out -Wall -Wmissing-declarations -Wmissing-prototypes, $(CFLAGS))
 endif
 
-override CPPFLAGS := -I$(srcdir) -I$(perl_archlibexp)/CORE $(CPPFLAGS)
+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