diff --git a/build/top.mk b/build/top.mk
index 154be9dd81..a003feb19b 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -137,6 +137,7 @@ PWD = pwd
 RANLIB = @RANLIB@
 RM = rm -f
 SED = sed
+SUBST = $(SHTOOL) subst
 
 # For manual pages
 # MANCOMPRESS=@MANCOMPRESS@
diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index e91dcd60cc..5769861222 100644
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -36,15 +36,6 @@ uctable.h: ucgendat.c $(srcdir)/UnicodeData.txt $(srcdir)/CompositionExclusions.
 ucgendat: $(XLIBS) ucgendat.o
 	$(LTLINK) -o $@ ucgendat.o $(LIBS)
 
-#DATFILES = case.dat cmbcl.dat comp.dat ctype.dat decomp.dat num.dat kdecomp.dat
-
-#install-local: $(PROGRAMS) FORCE
-#	-$(MKDIR) $(DESTDIR)$(datadir)/ucdata
-#	@for i in $(DATFILES); do \
-#		echo $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(DESTDIR)$(datadir)/ucdata; \
-#		$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(DESTDIR)$(datadir)/ucdata; \
-#	done
-
 .links :
 	@for i in $(XXSRCS) $(XXHEADERS); do \
 		$(RM) $$i ; \