--- rpl/src/Makefile.am	2013/10/26 14:17:53	1.93
+++ 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@
@@ -513,7 +512,12 @@ always: $(top_builddir)/src/rpl-conv.c
 
 all-local: always
 
-install-exec-local: librpl
+install-exec-local: librpl s-rpl
+
+s-rpl: install-binPROGRAMS
+	@if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
+		echo "  STRIP  rpl" && strip -d $(DESTDIR)$(bindir)/rpl; \
+	fi
 
 librpl: install-libLIBRARIES
 	@echo "  BUILD  $@"
@@ -570,8 +574,4 @@ librpl: install-libLIBRARIES
 			if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
 				echo "  STRIP  librpl.a" && strip -d librpl.a; \
 			fi;);
-	@if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
-		echo "  STRIP  rpl" && strip -d rpl; \
-	fi
 	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a
-