--- rpl/src/Makefile.am	2013/10/28 08:09:03	1.94
+++ rpl/src/Makefile.am	2014/06/24 08:38:25	1.96
@@ -1,4 +1,4 @@
-include $(top_builddir)/tools/openmotif.lib
+-include $(top_builddir)/tools/openmotif.lib
 
 ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a
 include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \
@@ -29,8 +29,7 @@ ldadd_libz = $(top_builddir)/tools/@ZLIB
 include_libz = -I$(top_builddir)/tools/@ZLIB@
 
 ldadd_librplcas = @LIBRPLCAS@
-include_librplcas = -I$(top_builddir)/rplcas/include/giac \
-		-I$(top_builddir)/rplcas/include
+include_librplcas = @INCRPLCAS@
 
 ldadd_libmotif = @LIBMOTIF@
 include_libmotif = @INCMOTIF@