summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-03-02 16:13:02 +0100
committerJim Meyering <meyering@redhat.com>2008-03-02 16:13:02 +0100
commite8139f2768efcd78a973cd1e9ef06a5ccfb275b5 (patch)
tree3dd981ee92bb9098c4932bcdc68e430062d53373
parentf33599c1441553954832851a0cec1e4ef570162f (diff)
downloadcoreutils-e8139f2768efcd78a973cd1e9ef06a5ccfb275b5.tar.xz
Don't infringe namespace of "sub"-Makefiles.
* GNUmakefile (_dummy, _have-Makefile): Add "_" prefix.
-rw-r--r--GNUmakefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 5f17049ae..f5aa6c403 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