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