diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-11 20:57:48 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-11 20:57:48 -0400 |
| commit | 3fe7cdc86d67dd5dcf1ce9d779b20dfec9eafb8d (patch) | |
| tree | 024689144c2da897a7a93b8485f76c60b97ba1a1 /src | |
| parent | 2171cea5fcc5537bf6179284bdce554d80982594 (diff) | |
Let configure test for a suitable mkdir -p
* configure.in (AC_PROG_MKDIR_P): Call it, to set MKDIR_P.
(MKDEPDIR): Use $MKDIR_P.
* Makefile.in (MKDIR_P): New, set by configure.
(mkdir): Use $MKDIR_P.
* doc/emacs/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.
* doc/lispintro/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.
* doc/lispref/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.
* doc/misc/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.
* src/Makefile.in (MKDIR_P): New, set by configure.
* src/ns.mk (${ns_appdir}, ${ns_appbindir}Emacs): Use $MKDIR_P.
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 @@ +2012-05-12 Glenn Morris <rgm@gnu.org> + + * Makefile.in (MKDIR_P): New, set by configure. + * ns.mk (${ns_appdir}, ${ns_appbindir}Emacs): Use $MKDIR_P. + 2012-05-11 Paul Eggert <eggert@cs.ucla.edu> 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@ # Substitute an assignment for the MAKE variable, because # BSD doesn't have it as a default. @SET_MAKE@ +MKDIR_P = @MKDIR_P@ # Don't use LIBS. configure puts stuff in it that either shouldn't be # linked with Emacs or is duplicated by the other stuff below. # LIBS = @LIBS@ @@ -284,7 +285,7 @@ CANNOT_DUMP=@CANNOT_DUMP@ DEPDIR=deps ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS=@DEPFLAGS@ -## test -d $(DEPDIR) || mkdir $(DEPDIR) (if AUTO_DEPEND); else ':'. +## ${MKDIR_P} ${DEPDIR} (if AUTO_DEPEND); else ':'. MKDEPDIR=@MKDEPDIR@ ## DO NOT use -R. There is a special hack described in lastfile.c diff --git a/src/ns.mk b/src/ns.mk index d3b5afeb99e..bdfee61bd0a 100644 --- a/src/ns.mk +++ b/src/ns.mk @@ -1,6 +1,6 @@ ### autodeps.mk --- src/Makefile fragment for GNU Emacs -## Copyright (C) 2008-2012 Free Software Foundation, Inc. +## Copyright (C) 2008-2012 Free Software Foundation, Inc. ## This file is part of GNU Emacs. @@ -27,11 +27,11 @@ ${ns_appdir}: ${ns_appsrc} rm -fr ${ns_appdir} - mkdir -p ${ns_appdir} + ${MKDIR_P} ${ns_appdir} ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - ) ${ns_appbindir}Emacs: emacs${EXEEXT} - mkdir -p ${ns_appbindir} + ${MKDIR_P} ${ns_appbindir} cp -f emacs${EXEEXT} ${ns_appbindir}Emacs ns-app: ${ns_appdir} ${ns_appbindir}Emacs |