diff --git a/ChangeLog b/ChangeLog index c25a7ae5201..332ee011bd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-18 Glenn Morris + * Makefile.in (install-arch-indep): + Move last element of mkdir rule here. + (mkdir): Remove rule. + * Makefile.in (install-arch-indep): Remove unneeded chmods. INSTALL_DATA does this for us. 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) ## On AIX, use tar xBf. ## On Xenix, use tar xpf. -.PHONY: install mkdir +.PHONY: install ### We do install-arch-indep first because ### the executable needs the Lisp files and DOC file to work properly. @@ -532,7 +532,17 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ ## place with their files read-only (perhaps because they are checked ## into RCS). In order to make this safe, we make sure that the ## source exists and is distinct from the destination. -install-arch-indep: mkdir info install-etc + +## I'm not sure creating locallisppath here serves any useful purpose. +## If it has the default value, then the later write_subdir commands +## will ensure all these components exist. +## This will only do something if locallisppath has a non-standard value. +## Is it really Emacs's job to create those directories? +## Should we also be ensuring they contain subdirs.el files? +## It would be easy to do, just use write_subdir. +install-arch-indep: info install-etc + umask 022 ; \ + $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` -set ${COPYDESTS} ; \ unset CDPATH; \ $(set_installuser); \ @@ -663,17 +673,6 @@ install-leim: leim/Makefile install-strip: $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install -## Note sure this serves any useful purpose. -## If locallisppath has the default value, then the write_subdir commands -## in install-arch-indep will create all these components. -## This will only do something if locallisppath has a non-standard value. -## Is it really Emacs job to create those directories? -## Should we also be ensuring they contain subdirs.el files? -## It would be easy to do. -mkdir: FRC - umask 022 ; \ - $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` - ### Delete all the installed files that the `install' target would ### create (but not the noninstalled files such as `make all' would create). ###