-info_TEXINFOS = openocd.texi
-openocd_TEXINFOS = fdl.texi
-man_MANS = openocd.1
-EXTRA_DIST = openocd.1
+info_TEXINFOS += %D%/openocd.texi
+%C%_openocd_TEXINFOS = %D%/fdl.texi
-MAINTAINERCLEANFILES = Makefile.in mdate-sh texinfo.tex
+dist_man_MANS += %D%/openocd.1
+
+EXTRA_DIST += %D%/manual
+
+MAINTAINERCLEANFILES += \
+ %D%/mdate-sh \
+ %D%/stamp-vti \
+ %D%/version.texi