diff --git a/client.mk b/client.mk
index 8b036c49d2034cf23ab1b44e262205ff441b1b6a..8ce623015d328a0af28256daeba09c92dde6af91 100644
--- a/client.mk
+++ b/client.mk
@@ -368,8 +368,7 @@ endif
 ####################################
 # Build it
 
-realbuild::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	@$(PYTHON) $(TOPSRCDIR)/js/src/config/check-sync-dirs.py $(TOPSRCDIR)/js/src/config $(TOPSRCDIR)/config
+realbuild::  $(OBJDIR)/Makefile $(OBJDIR)/config.status check-sync-dirs-config
 	$(MOZ_MAKE)
 
 ####################################
@@ -427,6 +426,12 @@ cleansrcdir:
 	   build/autoconf/clean-config.sh; \
 	fi;
 
+## Sanity check $X and js/src/$X are in sync
+.PHONY: check-sync-dirs
+check-sync-dirs: check-sync-dirs-build check-sync-dirs-config
+check-sync-dirs-%:
+	@$(PYTHON) $(TOPSRCDIR)/js/src/config/check-sync-dirs.py $(TOPSRCDIR)/js/src/$* $(TOPSRCDIR)/$*
+
 echo-variable-%:
 	@echo $($*)