--- icon-naming-utils-0.6.5/Makefile.am.paths	2006-01-17 13:31:41.462161000 -0500
+++ icon-naming-utils-0.6.5/Makefile.am	2006-01-17 13:33:48.378118000 -0500
@@ -1,5 +1,5 @@
 
-libexec_SCRIPTS = icon-name-mapping
+bin_SCRIPTS = icon-name-mapping
 
 %: %.pl.in
 	sed -e "s#\@PERL\@#$(PERL)#g"		\
@@ -7,27 +7,25 @@
 	< $< > $@
 
 %.pc: %.pc.in
-	sed -e "s#\@program_path\@#$(libexecdir)#g" \
+	sed -e "s#\@program_path\@#$(bindir)#g" \
             -e "s#\@VERSION\@#$(VERSION)#g" < $< > $@
 
 pkgconfig_in_files = icon-naming-utils.pc.in
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
 
-dtddir = $(datadir)/dtds
-dtd_DATA = legacy-icon-mapping.dtd
-
-pkgdata_DATA = legacy-icon-mapping.xml
+pkgdata_DATA = 				\
+	legacy-icon-mapping.xml 	\
+	legacy-icon-mapping.dtd
 
 EXTRA_DIST =				\
 	icon-name-mapping.pl.in		\
 	$(pkgconfig_in_files)		\
-	$(dtd_DATA)			\
 	$(pkgdata_DATA)
 
 CLEANFILES =				\
 	$(pkgconfig_DATA)		\
-	$(libexec_SCRIPTS)
+	$(bin_SCRIPTS)
 
 MAINTAINERCLEANFILES =			\
 	Makefile.in			\