aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--GNUmakefile8
2 files changed, 4 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 092f7e58128..81ce30efede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
12013-11-28 Eli Zaretskii <eliz@gnu.org> 12013-11-28 Eli Zaretskii <eliz@gnu.org>
2 2
3 * GNUmakefile (Makefile): Don't use $(CFG).
4 (CFG): Don't compute.
5
3 * configure.ac (PATH_SEP): Set and AC_SUBST. 6 * configure.ac (PATH_SEP): Set and AC_SUBST.
4 7
52013-11-27 Paul Eggert <eggert@cs.ucla.edu> 82013-11-27 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/GNUmakefile b/GNUmakefile
index 25c586d8356..856b47ca992 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -32,12 +32,6 @@
32# run "configure" by hand. But run autogen.sh first, if the source 32# run "configure" by hand. But run autogen.sh first, if the source
33# was checked out directly from the repository. 33# was checked out directly from the repository.
34 34
35ifneq ($(MSYSTEM),)
36CFG = CONFIG_SITE=$(CURDIR)/nt/mingw-cfg.site
37else
38CFG =
39endif
40
41# If a Makefile already exists, just use it. 35# If a Makefile already exists, just use it.
42 36
43ifeq ($(wildcard Makefile),Makefile) 37ifeq ($(wildcard Makefile),Makefile)
@@ -75,7 +69,7 @@ configure:
75Makefile: configure 69Makefile: configure
76 @echo >&2 'There seems to be no Makefile in this directory.' 70 @echo >&2 'There seems to be no Makefile in this directory.'
77 @echo >&2 'Running ./configure ...' 71 @echo >&2 'Running ./configure ...'
78 $(CFG) ./configure 72 ./configure
79 @echo >&2 'Makefile built.' 73 @echo >&2 'Makefile built.'
80 74
81endif 75endif