From: Jim Meyering <meyering@redhat.com>
Date: Sun, 2 Mar 2008 15:13:02 +0000 (+0100)
Subject: Don't infringe namespace of "sub"-Makefiles.
X-Git-Tag: v6.11~106
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8139f2768efcd78a973cd1e9ef06a5ccfb275b5;p=platform%2Fupstream%2Fcoreutils.git

Don't infringe namespace of "sub"-Makefiles.

* GNUmakefile (_dummy, _have-Makefile): Add "_" prefix.
---

diff --git a/GNUmakefile b/GNUmakefile
index 5f17049..f5aa6c4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -29,11 +29,11 @@ else
 SHELL = sh
 endif
 
-have-Makefile := $(shell test -f Makefile && echo yes)
+_have-Makefile := $(shell test -f Makefile && echo yes)
 
 # If the user runs GNU make but has not yet run ./configure,
 # give them a diagnostic.
-ifeq ($(have-Makefile),yes)
+ifeq ($(_have-Makefile),yes)
 
 # Make tar archive easier to reproduce.
 export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
@@ -50,18 +50,18 @@ ifeq (0,$(MAKELEVEL))
     _curr-ver := $(shell build-aux/git-version-gen .tarball-version)
     ifneq ($(_curr-ver),$(VERSION))
       $(info INFO: running autoreconf for new version string: $(_curr-ver))
-      dummy := $(shell rm -rf autom4te.cache; autoreconf)
+      _dummy := $(shell rm -rf autom4te.cache; autoreconf)
       _created_version_file = 1
     endif
   endif
 endif
 
 ifneq ($(_curr-ver),$(VERSION))
-  dummy := $(shell echo $(_curr-ver) > .version)
+  _dummy := $(shell echo $(_curr-ver) > .version)
 endif
 
 ifneq ($(_created_version_file),1)
-  dummy := $(shell test -f .version || echo $(VERSION) > .version)
+  _dummy := $(shell test -f .version || echo $(VERSION) > .version)
 endif
 
 include $(srcdir)/Makefile.cfg