diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e5f50f4f7d1..b7d3a85268c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-09  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* po/Makefile.am (check-no): Add.
+	(check-yes): Same.
+	* po/Makefile.in: Regenerate.
+	
 2001-08-09  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* acconfig.h (_GLIBCPP_MEM_LIMITS): Define.
diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
index 6243df9aaac..fe3a6fbed72 100644
--- a/libstdc++-v3/po/Makefile.am
+++ b/libstdc++-v3/po/Makefile.am
@@ -46,7 +46,9 @@ all-local-no:
 all-local-yes: $(LOCALE_OUT) 
 
 # 'make check' needs the catalogs constructed in build directory.
-check:
+check: check-@USE_NLS@
+check-no:
+check-yes:
 	$(mkinstalldirs) $(locale_builddir) 
 	@catalogs='$(LOCALE_OUT)'; \
 	for cat in $$catalogs; do \
@@ -69,8 +71,7 @@ install-data-local-yes: all-local-yes
 	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
 	  install_dir=$(locale_installdir)/$$lang/LC_MESSAGES; \
 	  $(mkinstalldirs) $$install_dir; \
-	  build_cat=$(locale_builddir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
-	  $(INSTALL_DATA) $$build_cat $$install_dir/$(PACKAGE).mo; \
+	  $(INSTALL_DATA) $$cat $$install_dir/$(PACKAGE).mo; \
 	done
 
 # Specify what gets cleaned up on a 'make clean'
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index f3c1c648f13..3a606fdb40d 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -280,7 +280,9 @@ all-local-no:
 all-local-yes: $(LOCALE_OUT) 
 
 # 'make check' needs the catalogs constructed in build directory.
-check:
+check: check-@USE_NLS@
+check-no:
+check-yes:
 	$(mkinstalldirs) $(locale_builddir) 
 	@catalogs='$(LOCALE_OUT)'; \
 	for cat in $$catalogs; do \
@@ -303,8 +305,7 @@ install-data-local-yes: all-local-yes
 	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
 	  install_dir=$(locale_installdir)/$$lang/LC_MESSAGES; \
 	  $(mkinstalldirs) $$install_dir; \
-	  build_cat=$(locale_builddir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
-	  $(INSTALL_DATA) $$build_cat $$install_dir/$(PACKAGE).mo; \
+	  $(INSTALL_DATA) $$cat $$install_dir/$(PACKAGE).mo; \
 	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.