diff --git a/include/Makefile.in b/include/Makefile.in
index fc184ed09..60b93f495 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2018 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2023 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -18,23 +18,23 @@ top_builddir = @top_builddir@
 
 include $(top_builddir)/make.tmpl
 
-cmds.h:
+.DELETE_ON_ERROR:
+cmds.h: $(top_srcdir)/tools/command-lines.in $(top_srcdir)/tools/license.inc Makefile
 	@echo "    [GEN] $@"
-	$(Q) set -o pipefail && \
+	$(Q) \
 	( cat $(top_srcdir)/tools/license.inc && \
 	  echo "/* Do not edit. This file is generated by the Makefile. */" && \
 	  echo "cmd(CMD_NONE, none)" && \
-	  $(GREP) '^ID:' $(top_srcdir)/tools/command-lines.in | LC_ALL=C $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \
+	  trap "$(RM) $@-t" EXIT INT QUIT TERM && \
+	  $(AWK) '/^ID:/ {print "cmd(" $$2 "_CMD, " $$2 ")"}' $< >$@-t && \
+	  LC_ALL=C $(SORT) -u $@-t && \
 	  echo "cmd(CMD_COUNT, count)" \
 	) > $@
 
 all: cmds.h
 
-clean:
-	rm -f cmds.h
-
 DISTCLEAN_TARGETS += configure.h lvm-version.h
-CLEAN_TARGETS += \
+CLEAN_TARGETS += cmds.h cmds.h-t \
  .symlinks \
  .symlinks_created \
  activate.h \
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4e196ab1e..2a663a5b6 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2023 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -166,23 +166,25 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
 	$(Q) $(CC) -E -P $< 2> /dev/null | \
 		$(EGREP) -v '^ *(|#.*|config|devtypes|dumpconfig|formats|fullreport|help|lastlog|lvmchange|lvpoll|pvdata|segtypes|systemid|tags|version) *$$' > .commands
 
-command-count.h: $(srcdir)/command-lines.in Makefile
+.DELETE_ON_ERROR:
+command-count.h: $(srcdir)/command-lines.in $(srcdir)/license.inc Makefile
 	@echo "    [GEN] $@"
-	$(Q) set -o pipefail && \
-	( cat $(top_srcdir)/tools/license.inc && \
-	  echo "/* Do not edit. This file is generated by the Makefile. */" && \
-	  echo -n "#define COMMAND_COUNT " && \
-	  $(GREP) '^ID:' $< | $(WC) -l \
-	) > $@
-
-command-lines-input.h: $(srcdir)/command-lines.in Makefile
-	@echo "    [GEN] $@"
-	$(Q) set -o pipefail && \
+	$(Q) \
 	( cat $(srcdir)/license.inc && \
 	  echo "/* Do not edit. This file is generated by the Makefile. */" && \
-	  echo -en "static const char _command_input[] =\n\n\"" && \
-	  $(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \
-	  echo "\\n\\n\";" \
+	  printf "#define COMMAND_COUNT " && \
+	  $(GREP) -c '^ID:' $< \
+	) > $@
+
+.DELETE_ON_ERROR:
+command-lines-input.h: $(srcdir)/command-lines.in $(srcdir)/license.inc Makefile
+	@echo "    [GEN] $@"
+	$(Q) \
+	( cat $(srcdir)/license.inc && \
+	  echo "/* Do not edit. This file is generated by the Makefile. */" && \
+	  printf "static const char _command_input[] =\n\n\"" && \
+	  $(AWK) 'BEGIN {ORS = "\\n\"\n\""} !/^#/ && !/---/ && !/^$$/' $(srcdir)/command-lines.in && \
+	  printf '\\n\\n";\n' \
 	) > $@
 
 $(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d): command-lines-input.h command-count.h
diff --git a/tools/license.inc b/tools/license.inc
index 5ba3e66d4..58e2441d8 100644
--- a/tools/license.inc
+++ b/tools/license.inc
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.  
- * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2023 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *