From 115577807b0c1d65b97255fe5336ac5c257da5a1 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Sat, 23 Feb 2013 10:17:41 +0100
Subject: buildsys: remove calls to mktemp

Nowadays we should not be racy in this area anymore, so simplify
generating temporary build-files.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 Makefile.in              | 14 ++++----------
 extra/locale/Makefile.in | 12 +++---------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 163184bca..80c70994b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -182,20 +182,14 @@ pregen: headers pregen-headers
 $(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh | $(top_builddir)include/bits
 	@$(disp_gen)
 	$(Q)set -e; \
-	tmp=`mktemp $(top_builddir)include/bits/sysnum.h.XXXXXX 2>/dev/null || true`; \
-	[ -z "$$tmp" ] && tmp='$(top_builddir)include/bits/sysnum.h.new'; \
-	KERNEL_HEADERS="${KERNEL_HEADERS}" CC="$(CC) $(CPU_CFLAGS)" $(SHELL) $< > $$tmp; \
-	if cmp $(top_builddir)include/bits/sysnum.h $$tmp >/dev/null 2>&1; then \
-		$(RM) $$tmp; \
-	else \
-		mv -f $$tmp $(top_builddir)include/bits/sysnum.h; \
-	fi
+	KERNEL_HEADERS="${KERNEL_HEADERS}" CC="$(CC) $(CPU_CFLAGS)" $(SHELL) $< > $@.new; \
+	cmp -s $@ $@.new && $(RM) $@.new || mv -f $@.new $@
 	@# Ugly linux specific hack..
 	$(Q)if grep -q __NR_ $@; then true; else \
 		rm -f $@; \
 		echo "ERROR: Could not generate syscalls."; \
-		echo "Make sure that you have proper kernel headers."; \
-		echo "Your .config in KERNEL_HEADERS=\"\" was set to:"; \
+		echo "Make sure that you have properly installed kernel headers."; \
+		echo "Your .config KERNEL_HEADERS=\"\" was set to:"; \
 		echo "${KERNEL_HEADERS}"; \
 		exit 1; \
 	fi
diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in
index 221a51585..3834c5c9e 100644
--- a/extra/locale/Makefile.in
+++ b/extra/locale/Makefile.in
@@ -111,16 +111,10 @@ ifeq ($(UCLIBC_BUILD_MINIMAL_LOCALE),y)
 	$(Q)echo "$(CURDIR)/$(locale_DIR)/charmaps/ISO-8859-1.pairs" >> $@
 else
 	$(Q)set -e; \
-		tmp=`mktemp $@.XXXXXX 2>/dev/null || true`; \
-		[ -z "$$tmp" ] && tmp='$@.new'; \
 		find $(CURDIR)/$(locale_DIR)/charmaps/ -name '*.pairs' | \
-			sort > $$tmp; \
-		[ -s $$tmp ]; \
-		if cmp $@ $$tmp >/dev/null 2>&1; then \
-			$(RM) $$tmp; \
-		else \
-			mv -f $$tmp $@; \
-		fi
+			sort > $@.new; \
+		[ -s $@.new ]; \
+		cmp -s $@ $@.new && $(RM) $@.new || mv -f $@.new $@
 endif
 
 # the lines beginning w/ '#-' are mandatory
-- 
cgit v1.2.3