aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-17 23:54:28 -0700
committerGlenn Morris2012-05-17 23:54:28 -0700
commit62061397bfc92eb454613e918a11f4a8ddbaffff (patch)
treee9143454a48b1b82b601800b3972e6695eb97fa6
parent37baa3c829b37b5811e733137e252082e5459fca (diff)
downloademacs-62061397bfc92eb454613e918a11f4a8ddbaffff.tar.gz
emacs-62061397bfc92eb454613e918a11f4a8ddbaffff.zip
Remove the mkdir rule from the top-level Makefile
* Makefile.in (install-arch-indep): Move last element of mkdir rule here. (mkdir): Remove rule.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in25
2 files changed, 16 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index c25a7ae5201..332ee011bd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
12012-05-18 Glenn Morris <rgm@gnu.org> 12012-05-18 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (install-arch-indep):
4 Move last element of mkdir rule here.
5 (mkdir): Remove rule.
6
3 * Makefile.in (install-arch-indep): Remove unneeded chmods. 7 * Makefile.in (install-arch-indep): Remove unneeded chmods.
4 INSTALL_DATA does this for us. 8 INSTALL_DATA does this for us.
5 9
diff --git a/Makefile.in b/Makefile.in
index edd67845e6b..7a4ee5e4a5d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -444,7 +444,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
444## On AIX, use tar xBf. 444## On AIX, use tar xBf.
445## On Xenix, use tar xpf. 445## On Xenix, use tar xpf.
446 446
447.PHONY: install mkdir 447.PHONY: install
448 448
449### We do install-arch-indep first because 449### We do install-arch-indep first because
450### the executable needs the Lisp files and DOC file to work properly. 450### the executable needs the Lisp files and DOC file to work properly.
@@ -532,7 +532,17 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
532## place with their files read-only (perhaps because they are checked 532## place with their files read-only (perhaps because they are checked
533## into RCS). In order to make this safe, we make sure that the 533## into RCS). In order to make this safe, we make sure that the
534## source exists and is distinct from the destination. 534## source exists and is distinct from the destination.
535install-arch-indep: mkdir info install-etc 535
536## I'm not sure creating locallisppath here serves any useful purpose.
537## If it has the default value, then the later write_subdir commands
538## will ensure all these components exist.
539## This will only do something if locallisppath has a non-standard value.
540## Is it really Emacs's job to create those directories?
541## Should we also be ensuring they contain subdirs.el files?
542## It would be easy to do, just use write_subdir.
543install-arch-indep: info install-etc
544 umask 022 ; \
545 $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
536 -set ${COPYDESTS} ; \ 546 -set ${COPYDESTS} ; \
537 unset CDPATH; \ 547 unset CDPATH; \
538 $(set_installuser); \ 548 $(set_installuser); \
@@ -663,17 +673,6 @@ install-leim: leim/Makefile
663install-strip: 673install-strip:
664 $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install 674 $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install
665 675
666## Note sure this serves any useful purpose.
667## If locallisppath has the default value, then the write_subdir commands
668## in install-arch-indep will create all these components.
669## This will only do something if locallisppath has a non-standard value.
670## Is it really Emacs job to create those directories?
671## Should we also be ensuring they contain subdirs.el files?
672## It would be easy to do.
673mkdir: FRC
674 umask 022 ; \
675 $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
676
677### Delete all the installed files that the `install' target would 676### Delete all the installed files that the `install' target would
678### create (but not the noninstalled files such as `make all' would create). 677### create (but not the noninstalled files such as `make all' would create).
679### 678###