diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 3 | ||||
| -rw-r--r-- | src/ns.mk | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 805fa7ee097..3c3f04b9238 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-05-12 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (MKDIR_P): New, set by configure. | ||
| 4 | * ns.mk (${ns_appdir}, ${ns_appbindir}Emacs): Use $MKDIR_P. | ||
| 5 | |||
| 1 | 2012-05-11 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2012-05-11 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Remove unused function hourglass_started. | 8 | Remove unused function hourglass_started. |
diff --git a/src/Makefile.in b/src/Makefile.in index 32276084b3f..dd667ea60a3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -40,6 +40,7 @@ version = @version@ | |||
| 40 | # Substitute an assignment for the MAKE variable, because | 40 | # Substitute an assignment for the MAKE variable, because |
| 41 | # BSD doesn't have it as a default. | 41 | # BSD doesn't have it as a default. |
| 42 | @SET_MAKE@ | 42 | @SET_MAKE@ |
| 43 | MKDIR_P = @MKDIR_P@ | ||
| 43 | # Don't use LIBS. configure puts stuff in it that either shouldn't be | 44 | # Don't use LIBS. configure puts stuff in it that either shouldn't be |
| 44 | # linked with Emacs or is duplicated by the other stuff below. | 45 | # linked with Emacs or is duplicated by the other stuff below. |
| 45 | # LIBS = @LIBS@ | 46 | # LIBS = @LIBS@ |
| @@ -284,7 +285,7 @@ CANNOT_DUMP=@CANNOT_DUMP@ | |||
| 284 | DEPDIR=deps | 285 | DEPDIR=deps |
| 285 | ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. | 286 | ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. |
| 286 | DEPFLAGS=@DEPFLAGS@ | 287 | DEPFLAGS=@DEPFLAGS@ |
| 287 | ## test -d $(DEPDIR) || mkdir $(DEPDIR) (if AUTO_DEPEND); else ':'. | 288 | ## ${MKDIR_P} ${DEPDIR} (if AUTO_DEPEND); else ':'. |
| 288 | MKDEPDIR=@MKDEPDIR@ | 289 | MKDEPDIR=@MKDEPDIR@ |
| 289 | 290 | ||
| 290 | ## DO NOT use -R. There is a special hack described in lastfile.c | 291 | ## DO NOT use -R. There is a special hack described in lastfile.c |
| @@ -1,6 +1,6 @@ | |||
| 1 | ### autodeps.mk --- src/Makefile fragment for GNU Emacs | 1 | ### autodeps.mk --- src/Makefile fragment for GNU Emacs |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2008-2012 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## This file is part of GNU Emacs. | 5 | ## This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -27,11 +27,11 @@ | |||
| 27 | 27 | ||
| 28 | ${ns_appdir}: ${ns_appsrc} | 28 | ${ns_appdir}: ${ns_appsrc} |
| 29 | rm -fr ${ns_appdir} | 29 | rm -fr ${ns_appdir} |
| 30 | mkdir -p ${ns_appdir} | 30 | ${MKDIR_P} ${ns_appdir} |
| 31 | ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - ) | 31 | ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - ) |
| 32 | 32 | ||
| 33 | ${ns_appbindir}Emacs: emacs${EXEEXT} | 33 | ${ns_appbindir}Emacs: emacs${EXEEXT} |
| 34 | mkdir -p ${ns_appbindir} | 34 | ${MKDIR_P} ${ns_appbindir} |
| 35 | cp -f emacs${EXEEXT} ${ns_appbindir}Emacs | 35 | cp -f emacs${EXEEXT} ${ns_appbindir}Emacs |
| 36 | 36 | ||
| 37 | ns-app: ${ns_appdir} ${ns_appbindir}Emacs | 37 | ns-app: ${ns_appdir} ${ns_appbindir}Emacs |