diff --git a/Makefile b/Makefile
index 35a8a85f8..672a47424 100644
--- a/Makefile
+++ b/Makefile
@@ -1192,20 +1192,8 @@ format:
 check-format:
 	build_tools/format-diff.sh -c
 
-buck-targets:
-	python buckifier/buckify_rocksdb.py
-
-check-buck-targets: buck-targets
-	$(eval TMP=$(shell bash -c "git diff TARGETS | head -n 1"))
-	@echo Running git diff on TARGETS, and the first line of output is...
-	@echo $(TMP)
-	@if [ -z "$(TMP)" ]; then \
-		exit 0; \
-	else \
-		echo "Please run 'make buck-targets' to update TARGETS file."; \
-		echo "Do not manually update TARGETS file."; \
-		exit 1; \
-	fi
+check-buck-targets:
+	buckifier/check_buck_targets.sh
 
 package:
 	bash build_tools/make_package.sh $(SHARED_MAJOR).$(SHARED_MINOR)
diff --git a/buckifier/check_buck_targets.sh b/buckifier/check_buck_targets.sh
new file mode 100755
index 000000000..ff97e9571
--- /dev/null
+++ b/buckifier/check_buck_targets.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+# If clang_format_diff.py command is not specfied, we assume we are able to
+# access directly without any path.
+
+TGT_DIFF=`git diff TARGETS | head -n 1`
+
+if [ ! -z "$TGT_DIFF" ]
+then
+  echo "TARGETS file has uncommitted changes. Skip this check."
+  exit 0
+fi
+
+echo Backup original TARGETS file.
+
+cp TARGETS TARGETS.bkp
+
+python buckifier/buckify_rocksdb.py
+
+TGT_DIFF=`git diff TARGETS | head -n 1`
+
+if [ -z "$TGT_DIFF" ]
+then
+  mv TARGETS.bkp TARGETS
+  exit 0
+else
+  echo "Please run 'python buckifier/buckify_rocksdb.py' to update TARGETS file."
+  echo "Do not manually update TARGETS file."
+  mv TARGETS.bkp TARGETS
+  exit 1
+fi