From 150c4ff002a7e8970efa79ebb14f9f25db7f2edd Mon Sep 17 00:00:00 2001
From: Andrew Johnson
Date: Fri, 3 Oct 2008 18:28:56 +0000
Subject: [PATCH] A proper fix for the xsubpp problems on Perl 5.8.0.
---
documentation/RELEASE_NOTES.html | 8 ++++----
src/cap5/Makefile | 9 +++------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index 6bd9a4a1d..ea0239e6a 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -236,10 +236,10 @@ implementations have been converted from K&R to ANSI C prototypes.
Added Perl5 CA library
Base now provides a CA client library interface for Perl5 scripts in
-src/cap5 and includes some alternative implementations of the catools
-programs written in Perl (for demonstration purposes mainly). Documentation on
-how to use the library is available in html/CA.html after the build
-completes.
+src/cap5 and includes as examples some implementations of the catools
+programs written in Perl. Documentation on how to use the Perl library is
+available in base/html/CA.html after the build completes. This library
+cannot currently be built on Windows targets.
IOC ignores SIGHUP
diff --git a/src/cap5/Makefile b/src/cap5/Makefile
index 9f052e278..dc2c7236a 100644
--- a/src/cap5/Makefile
+++ b/src/cap5/Makefile
@@ -43,18 +43,15 @@ endif
include $(TOP)/configure/RULES
ifdef T_A
- PERL5_DIR = $(dir $(shell $(PERL) ../perlConfig.pl perl5))
- XSUBPP = $(PERL5_DIR)xsubpp$(BAT)
- PODCHECKER = $(PERL5_DIR)podchecker$(BAT)
- TYPEMAP = $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils/typemap
+ EXTUTILS = $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils
%.c: ../%.xs
$(RM) $@ $@_new
- $(XSUBPP) -typemap $(TYPEMAP) $< > $@_new && $(MV) $@_new $@
+ $(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap $< > $@_new && $(MV) $@_new $@
%.html: %.pm
$(RM) $@
- $(PODCHECKER) $< && pod2html --infile=$< --outfile=$@
+ podchecker $< && pod2html --infile=$< --outfile=$@
clean::
$(RM) Cap5.c