From 82abd96fc913a9c3559d3c543fecdf7e81c2a64f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 22 Sep 2008 17:46:41 +0000
Subject: [PATCH] Build cap5 everywhere other than WIN32 archs.

---
 src/Makefile      |  2 +-
 src/cap5/Makefile | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 9e284df1f..19a9fd617 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -90,7 +90,7 @@ cas_DEPEND_DIRS = ca gdd
 DIRS += excas
 excas_DEPEND_DIRS = cas as registry
 
-#DIRS += cap5
+DIRS += cap5
 cap5_DEPEND_DIRS = ca dbStatic
 
 
diff --git a/src/cap5/Makefile b/src/cap5/Makefile
index 316e83000..069df4617 100644
--- a/src/cap5/Makefile
+++ b/src/cap5/Makefile
@@ -17,18 +17,18 @@ ifneq ($(findstring win32,$(T_A)),)
   BAT = .bat
 endif
 
-EXPAND += cainfo.pl@ caput.pl@ caget.pl@ camonitor.pl@ CA.pm@
+ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),)
+  # Doesn't build on WIN32
+  LOADABLE_LIBRARY_HOST = Cap5
 
-PERL_SCRIPTS += cainfo.pl
-PERL_SCRIPTS += caput.pl
-PERL_SCRIPTS += caget.pl
-PERL_SCRIPTS += camonitor.pl
+  EXPAND += cainfo.pl@ caput.pl@ caget.pl@ camonitor.pl@ CA.pm@
 
-PERL_MODULES += CA.pm
+  PERL_SCRIPTS += cainfo.pl
+  PERL_SCRIPTS += caput.pl
+  PERL_SCRIPTS += caget.pl
+  PERL_SCRIPTS += camonitor.pl
 
-ifeq ($(findstring win32,$(T_A)),)
-# Doesn't build on WIN32 yet...
-LOADABLE_LIBRARY_HOST = Cap5
+  PERL_MODULES += CA.pm
 endif
 
 Cap5_SRCS = Cap5.xs
@@ -46,8 +46,8 @@ include $(TOP)/configure/RULES
 
 ifdef T_A
   PERL5_DIR = $(dir $(shell $(PERL) ../perlConfig.pl perl5))
-  XSUBPP = $(PERL) $(PERL5_DIR)xsubpp$(BAT)
-  PODCHECKER = $(PERL) $(PERL5_DIR)podchecker$(BAT)
+  XSUBPP = $(PERL5_DIR)xsubpp$(BAT)
+  PODCHECKER = $(PERL5_DIR)podchecker$(BAT)
   TYPEMAP = $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils/typemap
 
   %.c: ../%.xs