diff options
| author | Paul Eggert | 2015-06-24 23:34:26 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-06-24 23:35:02 -0700 |
| commit | 319eeeb0fb154a0cd1d36ec33c68029ff9d6c290 (patch) | |
| tree | 930cc33e8c621a62c131cecf3173dd19c7e1b234 | |
| parent | 93f4f67ba93b78e8b31e498e8ce7bce4c8298b76 (diff) | |
| download | emacs-319eeeb0fb154a0cd1d36ec33c68029ff9d6c290.tar.gz emacs-319eeeb0fb154a0cd1d36ec33c68029ff9d6c290.zip | |
Get ‘./configure; make -C src emacs’ to work
Without this fix, lib/fcntl.h isn't built in time (Bug#20894).
* lib-src/Makefile.in (../lib/libgnu.a):
* src/Makefile.in ($(lib)/libgnu.a): Build all, not libgnu.a.
| -rw-r--r-- | lib-src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 6b5d379e38b..a175967156a 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -350,7 +350,7 @@ TAGS: etags${EXEEXT} | |||
| 350 | etags *.[ch] | 350 | etags *.[ch] |
| 351 | 351 | ||
| 352 | ../lib/libgnu.a: $(config_h) | 352 | ../lib/libgnu.a: $(config_h) |
| 353 | $(MAKE) -C ../lib libgnu.a | 353 | $(MAKE) -C ../lib all |
| 354 | 354 | ||
| 355 | regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h) | 355 | regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h) |
| 356 | $(AM_V_CC)$(CC) -c $(CPP_CFLAGS) $< | 356 | $(AM_V_CC)$(CC) -c $(CPP_CFLAGS) $< |
diff --git a/src/Makefile.in b/src/Makefile.in index e5c5ddbcbc6..bfb911e9ab4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -556,7 +556,7 @@ globals.h: gl-stamp; @true | |||
| 556 | $(ALLOBJS): globals.h | 556 | $(ALLOBJS): globals.h |
| 557 | 557 | ||
| 558 | $(lib)/libgnu.a: $(config_h) | 558 | $(lib)/libgnu.a: $(config_h) |
| 559 | $(MAKE) -C $(lib) libgnu.a | 559 | $(MAKE) -C $(lib) all |
| 560 | 560 | ||
| 561 | ## We have to create $(etc) here because init_cmdargs tests its | 561 | ## We have to create $(etc) here because init_cmdargs tests its |
| 562 | ## existence when setting Vinstallation_directory (FIXME?). | 562 | ## existence when setting Vinstallation_directory (FIXME?). |