--- rpl/tools/Makefile.am	2017/01/18 15:48:09	1.143
+++ rpl/tools/Makefile.am	2020/05/21 17:45:03	1.159
@@ -1,45 +1,7 @@
 EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \
 		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
 		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
-		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz @ZLIB@.tar.gz \
-		@NCURSES@-20150613.patch.gz @NCURSES@-20150627.patch.gz \
-		@NCURSES@-20150704.patch.gz @NCURSES@-20150711.patch.gz \
-		@NCURSES@-20150719.patch.gz @NCURSES@-20150725.patch.gz \
-		@NCURSES@-20150808.patch.gz @NCURSES@-20150810.patch.gz \
-		@NCURSES@-20150815.patch.gz @NCURSES@-20150822.patch.gz \
-		@NCURSES@-20150905.patch.gz @NCURSES@-20150912.patch.gz \
-		@NCURSES@-20150919.patch.gz @NCURSES@-20150926.patch.gz \
-		@NCURSES@-20151010.patch.gz @NCURSES@-20151017.patch.gz \
-		@NCURSES@-20151024.patch.gz @NCURSES@-20151101.patch.gz \
-		@NCURSES@-20151107.patch.gz @NCURSES@-20151121.patch.gz \
-		@NCURSES@-20151128.patch.gz @NCURSES@-20151205.patch.gz \
-		@NCURSES@-20151212.patch.gz @NCURSES@-20151219.patch.gz \
-		@NCURSES@-20151226.patch.gz @NCURSES@-20160102.patch.gz \
-		@NCURSES@-20160116.patch.gz @NCURSES@-20160123.patch.gz \
-		@NCURSES@-20160130.patch.gz @NCURSES@-20160206.patch.gz \
-		@NCURSES@-20160213.patch.gz @NCURSES@-20160220.patch.gz \
-		@NCURSES@-20160305.patch.gz @NCURSES@-20160312.patch.gz \
-		@NCURSES@-20160319.patch.gz @NCURSES@-20160326.patch.gz \
-		@NCURSES@-20160402.patch.gz @NCURSES@-20160409.patch.gz \
-		@NCURSES@-20160416.patch.gz @NCURSES@-20160423.patch.gz \
-		@NCURSES@-20160507.patch.gz @NCURSES@-20160514.patch.gz \
-		@NCURSES@-20160521.patch.gz @NCURSES@-20160528.patch.gz \
-		@NCURSES@-20160604.patch.gz @NCURSES@-20160611.patch.gz \
-		@NCURSES@-20160618.patch.gz @NCURSES@-20160625.patch.gz \
-		@NCURSES@-20160702.patch.gz @NCURSES@-20160709.patch.gz \
-		@NCURSES@-20160723.patch.gz @NCURSES@-20160730.patch.gz \
-		@NCURSES@-20160806.patch.gz @NCURSES@-20160813.patch.gz \
-		@NCURSES@-20160820.patch.gz @NCURSES@-20160827.patch.gz \
-		@NCURSES@-20160903.patch.gz @NCURSES@-20160910.patch.gz \
-		@NCURSES@-20160917.patch.gz @NCURSES@-20160924.patch.gz \
-		@NCURSES@-20161001.patch.gz @NCURSES@-20161008.patch.gz \
-		@NCURSES@-20161015.patch.gz @NCURSES@-20161022.patch.gz \
-		@NCURSES@-20161029.patch.gz @NCURSES@-20161105.patch.gz \
-		@NCURSES@-20161112.patch.gz @NCURSES@-20161119.patch.gz \
-		@NCURSES@-20161126.patch.gz @NCURSES@-20161203.patch.gz \
-		@NCURSES@-20161210.patch.gz @NCURSES@-20161217.patch.gz \
-		@NCURSES@-20161224.patch.gz @NCURSES@-20161231.patch.gz \
-		@NCURSES@-20170107.patch.gz @NCURSES@-20170114.patch.gz
+		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz @ZLIB@.tar.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @BUILD_SIGSEGV@ @BUILD_OPENMOTIF@ \
@@ -67,6 +29,9 @@ clean distclean:
 			$(MAKE) -C $$subdir $@; \
 		fi; \
 	done;
+	if [ -d @OPENMOTIF@/install ]; then \
+		rm -rf @OPENMOTIF@/install; \
+	fi
 	if [ -f @OPENSSL@/tests_success ]; then \
 		rm -f @OPENSSL@/tests_success; \
 	fi
@@ -87,7 +52,7 @@ install: all
 	$(INSTALL_PROGRAM) $(GPP)/src/gpp$(EXEEXT) \
 			$(DESTDIR)$(bindir)/rplpp$(EXEEXT)
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
-	$(INSTALL_DATA) $(srcdir)/$(GPP)/doc/gpp.1 $(DESTDIR)$(mandir)/man1
+	$(INSTALL_DATA) $(GPP)/doc/gpp.1 $(DESTDIR)$(mandir)/man1
 	ln -sf $(DESTDIR)$(mandir)/man1/gpp.1 $(DESTDIR)$(mandir)/man1/rplpp.1
 	if [ @GNUPLOT_COMPILATION@ ]; then \
 			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi