X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/969f17355762d9ace52a38c490a2282b27ad8089..c3e1d4359ed586fa30ba45e8b9bc8f3a230f130b:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7ecd8985be..df94153415 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,12 +82,12 @@ datadir=@datadir@
 # runs.	 These files are all architecture-independent. Right now, the
 # only such data is the locking directory; ${lockdir} is a
 # subdirectory of this.
-statedir=@statedir@
+sharedstatedir=@sharedstatedir@
 
 # Where to install and expect executable files to be run by Emacs
 # rather than directly by users, and other architecture-dependent
 # data.	 ${archlibdir} is a subdirectory of this.
-libdir=@libdir@
+libexecdir=@libexecdir@
 
 # Where to install Emacs's man pages, and what extension they should have.
 mandir=@mandir@
@@ -99,6 +99,9 @@ manext=.1
 # system, it is inappropriate to imply that it is part of Emacs.
 infodir=@infodir@
 
+# Where to look for bitmap files.
+bitmapdir=@bitmapdir@
+
 # Where to find the source code.  The source code for Emacs's C kernel is
 # expected to be in ${srcdir}/src, and the source code for Emacs's
 # utility programs is expected to be in ${srcdir}/lib-src.  This is
@@ -208,6 +211,7 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in
 	  -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'		\
 	  -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";'			\
 	  -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'			\
+	  -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";'		\
 	  -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";'			\
 	  -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') &&		\
 	${srcdir}/move-if-change paths.h.tmp$$$$ src/paths.h
@@ -219,7 +223,10 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in
 # something notable, so the only unnecessary work we do is in building
 # paths.h.tmp$$$$, which isn't much.
 # Note that sed is not in /bin on 386bsd.
-paths-force: FRC
+# We depend on src/paths.h here to prevent simultaneous execution of
+# that rule and this one, in a parallel make.
+# It is possible for paths.h to be updated twice--but that would happen anyway.
+paths-force: FRC src/paths.h
 	@echo "Producing \`src/paths.h' from \`src/paths.h.in'."
 	@(lisppath=`echo ${lisppath} | ${removenullpaths}` ;		\
 	  buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;	\
@@ -229,6 +236,7 @@ paths-force: FRC
 	  -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'		\
 	  -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";'			\
 	  -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'			\
+	  -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";'		\
 	  -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";'			\
 	  -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') &&		\
 	${srcdir}/move-if-change paths.h.tmp$$$$ src/paths.h
@@ -291,8 +299,8 @@ install: ${SUBDIR} install-arch-dep install-arch-indep blessmail;
 install-arch-dep: mkdir
 	(cd lib-src; \
 	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
-	    exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
-	    archlibdir=${archlibdir})
+	    exec_prefix=${exec_prefix} bindir=${bindir} \
+	    libexecdir=${libexecdir} archlibdir=${archlibdir})
 	${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version}
 	-chmod 1755  ${bindir}/emacs-${version}
 	rm -f ${bindir}/$(EMACS)
@@ -300,6 +308,11 @@ install-arch-dep: mkdir
 
 ### Note that we copy the DOC-* files from the build etc directory
 ### as well as lots of things from ${srcdir}/etc.
+
+# These lines appeared after the second -set, but should be unnecessary.
+#	 mkdir ${COPYDESTS} ; \
+#	 chmod ugo+rx ${COPYDESTS} ; \
+# The backslash above continues the comment onto this line.  It ends here.
 install-arch-indep: mkdir
 	-set ${COPYDESTS} ; \
 	 for dir in ${COPYDIR} ; do \
@@ -309,7 +322,6 @@ install-arch-indep: mkdir
 	   shift ; \
 	 done
 	-set ${COPYDESTS} ; \
-	 mkdir ${COPYDESTS} ; \
 	 for dir in ${COPYDIR} ; do \
 	   dest=$$1 ; shift ; \
 	   [ -d $${dir} ] \
@@ -321,8 +333,11 @@ install-arch-indep: mkdir
 		 rm -rf $${subdir}/CVS ; \
 		 rm -f  $${subdir}/\#* ; \
 		 rm -f  $${subdir}/*~ ; \
+		 rm -f  $${subdir}/*.orig ; \
 	       done) ; \
 	 done
+	-rm -f ${lispdir}/subdirs.el
+	./update-subdirs ${lispdir}
 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
 	then \
 	   echo "Copying etc/DOC-* ..." ; \
@@ -345,11 +360,11 @@ install-arch-indep: mkdir
 
 ### Build all the directories we're going to install Emacs in.	Since
 ### we may be creating several layers of directories (for example,
-### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use make-path
-### instead of mkdir.  Not all systems' mkdirs have the `-p' flag.
+### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
+### instead of mkdir.  Not all systems' mkdir programs have the `-p' flag.
 mkdir: FRC
-	./lib-src/make-path ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
-	  ${bindir} ${datadir} ${docdir} ${libdir} \
+	$(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
+	  ${bindir} ${datadir} ${docdir} ${libexecdir} \
 	  `echo ${locallisppath} | sed 's/:/ /g'`
 	-chmod 777 ${lockdir}
 
@@ -362,7 +377,7 @@ uninstall:
 	(cd lib-src; 					\
 	 $(MAKE) $(MFLAGS) uninstall			\
 	    prefix=${prefix} exec_prefix=${exec_prefix}	\
-	    bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
+	    bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir})
 	for dir in ${lispdir} ${etcdir} ; do 		\
 	  if [ -d $${dir} ]; then			\
 	    case `(cd $${dir} ; /bin/pwd)` in		\
@@ -376,9 +391,9 @@ uninstall:
 	    esac ;					\
 	  fi ;						\
 	done
-	(cd ${infodir}; rm -f cl* emacs* forms* info* vip*)
-	(cd ${mandir};  rm -f emacs.1 etags.1 ctags.1)
-	(cd ${bindir};  rm -f emacs-${version} $(EMACS))
+	(cd ${infodir} && rm -f cl* emacs* forms* info* vip*)
+	(cd ${mandir}  && rm -f emacs.1 etags.1 ctags.1)
+	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
 
 
 FRC:
@@ -421,9 +436,9 @@ clean: FRC
 ###      `make distclean' should leave only the files that were in the
 ###      distribution.
 top_distclean=\
-	rm -f config.status build-install ; \
+	rm -f config.status ; \
 	rm -f Makefile ${SUBDIR_MAKEFILES} ; \
-	(cd lock ; rm -f *)
+	(cd lock && rm -f *)
 distclean: FRC
 	(cd src;      $(MAKE) $(MFLAGS) distclean)
 	(cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
@@ -458,7 +473,7 @@ realclean: FRC
 ### it deletes backup and autosave files too.
 extraclean:
 	for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done
-	-(cd lock; rm *)
+	-(cd lock && rm *)
 	-rm config.status config-tmp-*
 	-rm -f *~ \#*
 
@@ -473,7 +488,7 @@ extraclean:
 ### and VC will swiftly let you know if this happens, and it is easily
 ### corrected.
 SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \
-	README build-install.in configure make-dist move-if-change
+	README configure make-dist move-if-change
 
 .PHONY: unlock relock
 
@@ -508,6 +523,7 @@ check:
 	@echo "We don't have any tests for GNU Emacs yet."
 
 dist:
+	./update-subdirs ${srcdir}/lisp
 	cd ${srcdir}; make-dist
 
 .PHONY: info dvi dist check
@@ -515,4 +531,4 @@ force-info:
 info: force-info
 	(cd ${srcdir}/man; $(MAKE) $(MFLAGS) info)
 dvi:
-	(cd ${srcdir}/man; $(MAKE) $(MFLAGS) dvi)
+	(cd man; $(MAKE) $(MFLAGS) dvi)