Index: /trunk/pois/swig/Makefile.am
===================================================================
--- /trunk/pois/swig/Makefile.am	(revision 3867)
+++ /trunk/pois/swig/Makefile.am	(revision 3868)
@@ -14,5 +14,5 @@
 SWIG += -Drestrict= -Dinline=
 
-AM_CFLAGS += $(XPA_CFLAGS) -I../src
+AM_CFLAGS += -I../src
 #
 # Libraries to install
@@ -28,4 +28,6 @@
 #
 libpsLibSwig_la_LDFLAGS  = -module
+libpsLibSwig_la_LIBADD   = $(PSLIB_LIBS)
+
 libpsLibSwig_la_SOURCES = \
 	psLibSwig_wrap.c \
@@ -37,11 +39,6 @@
 # Now for XPA
 #
-# N.b. environment variable XPA_DIR must be set externally
-#
-XPA_CFLAGS = -I$(XPA_DIR)/include
-XPA_LIBS   = -L$(XPA_DIR)/lib -lxpa
-
 libxpaSwig_la_LIBADD       = $(PSLIB_LIBS)
-libxpaSwig_la_LIBADD      += $(XPA_LIBS)
+libxpaSwig_la_LIBADD      += -lxpa
 
 libxpaSwig_la_LDFLAGS = -module
@@ -51,5 +48,5 @@
 
 xpaSwig.py xpaSwig_wrap.c : xpaSwig.i p_psSwig.i
-	$(SWIG) $(PS_INCLUDES) -I$(XPA_DIR)/include xpaSwig.i
+	$(SWIG) $(PS_INCLUDES) xpaSwig.i
 	@case "$(SWIG)" in \
 	  *-perl*) \