--- a/Makefile.in
+++ b/Makefile.in
@@ -32,6 +32,8 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
+canonical_prefix = @canonical_prefix@
+
 bindir = @bindir@
 libdir = @libdir@
 includedir = @includedir@
@@ -85,8 +87,8 @@
 CATGETS_SOURCES = catopen.c catgets.c catclose.c mctab.c mcref.c mcfree.c
 CATGETS_OBJECTS = $(subst .c,.$(OBJEXT),$(CATGETS_SOURCES))
 
-GENCAT_HEADERS  = gencat.h gcmsgs.h
-GENCAT_SOURCES  = gencat.c mcload.c mcsource.c mciconv.c mcmerge.c
+GENCAT_HEADERS  = gencat.h gcmsgs.h mcutfsig.h
+GENCAT_SOURCES  = gencat.c mcload.c mcsource.c mciconv.c mcmerge.c mcutfsig.c
 GENCAT_OBJECTS  = @GENCAT_OBJECTS@
 
 OTHER_SOURCES   = COPYING ChangeLog mkinstalldirs install-sh $(MISC_SOURCES)
@@ -110,7 +112,7 @@
 	$(LN_S) $< $@
 
 HEADER_TRANSFORM_SCRIPT = \
-  -e 's,@HOST_PREFIX@,${prefix},g' \
+  -e 's,@HOST_PREFIX@,${canonical_prefix},g' \
   -e 's,@PATH_SEPARATOR_INTERNAL@,$(PATH_SEPARATOR_INTERNAL),g' \
   -e 's,$(subst .,\.,$@)\.in$$,$@ -- $(AUTOGENERATED),'
 
@@ -146,7 +148,7 @@
 ## ============== ##
 
 mkinstalldirs = ${srcdir}/mkinstalldirs
-target = @target_alias@`test -n "@target_alias@" && echo "-"`
+tool_prefix = @target_alias@`test -n "@target_alias@" && echo "-"`
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -159,10 +161,10 @@
 install-progs: all
 	$(mkinstalldirs) --require ${exec_prefix} ${bindir} ${libdir}
 	for prog in $(BUILD_PROGS); do \
-	  $(INSTALL_PROGRAM) $$prog ${bindir}/$(target)$$prog; \
+	  $(INSTALL_PROGRAM) $$prog ${bindir}/$(tool_prefix)$$prog; \
 	done
 	for prog in $(INSTALL_PROGS); do \
-	  $(INSTALL_PROGRAM) ${srcdir}/$$prog ${bindir}/$(target)$$prog; \
+	  $(INSTALL_PROGRAM) ${srcdir}/$$prog ${bindir}/$(tool_prefix)$$prog; \
 	done
 
 install-libs: all-libs $(all-dll)
@@ -230,9 +232,10 @@
 ## ========== ##
 
 clean:
+	rm -f nlspath.h $(LOCAL_HEADERS) $(REPLACEMENT_HEADERS)
 	rm -f *.$(OBJEXT) *~ gencat$(EXEEXT)
 
 distclean: clean
 	rm -rf Makefile config.h config.[ls]* autom4te.cache
 
-# $RCSfile$Revision$: end of file
+# $RCSfile$Revision: 1.1.1.1 $: end of file