[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108277: Makefile simplifications rel
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108277: Makefile simplifications related to creating installation directories |
Date: |
Thu, 17 May 2012 23:46:05 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108277
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-17 23:46:05 -0700
message:
Makefile simplifications related to creating installation directories
A separate mkdir rule is not needed, since MKDIR_P is thread-safe.
* Makefile.in (install-arch-dep): Ensure bindir exists.
Drop mkdir dependency.
(install-arch-indep): Ensure docdir, infodir, mandir exist.
(install-leim): Drop mkdir dependency.
(mkdir): Remove most directories, now made in relevant rules.
modified:
ChangeLog
Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-18 06:39:52 +0000
+++ b/ChangeLog 2012-05-18 06:46:05 +0000
@@ -1,5 +1,11 @@
2012-05-18 Glenn Morris <address@hidden>
+ * Makefile.in (install-arch-dep): Ensure bindir exists.
+ Drop mkdir dependency.
+ (install-arch-indep): Ensure docdir, infodir, mandir exist.
+ (install-leim): Drop mkdir dependency.
+ (mkdir): Remove most directories, now made in relevant rules.
+
* Makefile.in (install-arch-indep): Combine adjacent loops.
2012-05-17 Glenn Morris <address@hidden>
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-05-18 06:39:52 +0000
+++ b/Makefile.in 2012-05-18 06:46:05 +0000
@@ -471,7 +471,8 @@
### to ensure that install-arch-indep finishes before this starts.
### (TODO Why would it be nice? Why not just make this depend on
### install-arch-indep then?)
-install-arch-dep: mkdir
+install-arch-dep:
+ umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
(cd lib-src; \
$(MAKE) install $(MFLAGS) prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} \
@@ -578,6 +579,7 @@
docfile="DOC"; \
fi; \
echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \
+ umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${docdir}/$${docfile}; \
(cd $(DESTDIR)$(docdir); \
$(set_installuser); \
@@ -592,6 +594,7 @@
${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \
done) \
else true; fi
+ umask 022; ${MKDIR_P} $(DESTDIR)${infodir}
-unset CDPATH; \
thisdir=`/bin/pwd`; \
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} &&
/bin/pwd)` ]; \
@@ -621,6 +624,7 @@
done); \
else true; fi
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
+ umask 022; ${MKDIR_P} $(DESTDIR)${man1dir}
thisdir=`/bin/pwd`; \
cd ${mansrcdir}; \
for page in *.1; do \
@@ -655,20 +659,23 @@
### have separate target here instead of including it in
### `install-arch-indep'. People who extracted LEIM files after they
### installed Emacs itself can install only LEIM files by this target.
-install-leim: leim/Makefile mkdir
+install-leim: leim/Makefile
cd leim && $(MAKE) $(MFLAGS) install
### Build Emacs and install it, stripping binaries while installing them.
install-strip:
$(MAKE) $(MFLAGS) INSTALL_STRIP=-s install
-### Build some of the directories we're going to install Emacs in.
+## 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)${datadir} ${COPYDESTS} \
- $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
- $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
- $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
+ $(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).
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108277: Makefile simplifications related to creating installation directories,
Glenn Morris <=