X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c55db078cf3f2518fb9cb961363816e226f24dc0..7317d9e8fc29204a4afd6274e05ed934753e59c0:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2bca691fa1..7f6f6a293e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,6 +44,8 @@ C_SWITCH_SYSTEM=@c_switch_system@
 ALLOCA=@ALLOCA@
 LN_S=@LN_S@
 CFLAGS=@CFLAGS@
+LDFLAGS=@LDFLAGS@
+CPPFLAGS=@CPPFLAGS@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
 YACC=@YACC@
@@ -79,9 +81,8 @@ bindir=@bindir@
 datadir=@datadir@
 
 # Where to install and expect the files that Emacs modifies as it
-# runs.	 These files are all architecture-independent. Right now, the
-# only such data is the locking directory; ${lockdir} is a
-# subdirectory of this.
+# runs.  These files are all architecture-independent.
+# Right now, this is not used.
 sharedstatedir=@sharedstatedir@
 
 # Where to install and expect executable files to be run by Emacs
@@ -112,6 +113,9 @@ srcdir=@srcdir@
 # Tell make where to find source files; this is needed for the makefiles.
 VPATH=@srcdir@
 
+# Where to find the application default.
+x_default_search_path=@x_default_search_path@
+
 # ==================== Emacs-specific directories ====================
 
 # These variables hold the values Emacs will actually use.  They are
@@ -154,11 +158,6 @@ buildlisppath=${srcdir}/lisp
 # at once.
 etcdir=@etcdir@
 
-# Where to create and expect the locking directory, where
-# the Emacs locking code keeps track of which files are
-# currently being edited.
-lockdir=@lockdir@
-
 # Where to put executables to be run by Emacs rather than
 # the user.  This path usually includes the Emacs version
 # and configuration name, so that multiple configurations
@@ -208,6 +207,7 @@ removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
 paths-force: FRC
 	@(lisppath=`echo ${lisppath} | ${removenullpaths}` ;		\
 	  buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;	\
+	  x_default_search_path=`echo ${x_default_search_path}`; \
 	  sed < ${srcdir}/src/paths.in > paths.h.$$$$		\
 	  -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'	\
 	  -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
@@ -215,10 +215,13 @@ paths-force: FRC
 	  -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}/";') &&		\
+	  -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
+	  -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') &&		\
 	${srcdir}/move-if-change paths.h.$$$$ src/paths.h
 
+# For parallel make, src should be build before leim.
+leim:   src
+
 src:	lib-src FRC
 
 lib-src: FRC src/config.stamp
@@ -247,6 +250,9 @@ src/config.stamp: src/config.in config.status
 lib-src/Makefile: lib-src/Makefile.in config.status
 	./config.status
 
+man/Makefile: man/Makefile.in config.status
+	./config.status
+
 oldXMenu/Makefile: oldXMenu/Makefile.in config.status
 	./config.status
 
@@ -274,7 +280,7 @@ leim/Makefile: leim/Makefile.in config.status
 ## source exists and is distinct from the destination.
 ### We do install-arch-indep first because
 ### the executable needs the Lisp files and DOC file to work properly.
-install: all install-arch-indep install-arch-dep blessmail
+install: all install-arch-indep install-arch-dep install-leim blessmail
 	@true
 
 ### Install the executables that were compiled specifically for this machine.
@@ -294,10 +300,10 @@ install-arch-dep: mkdir
 ### Install the files that are machine-independent.
 ### Most of them come straight from the distribution;
 ### the exception is the DOC-* files, which are copied
-### from the build directory.
+## from the build directory.
 
-### Note that we copy DOC* and then delete DOC
-### as a workaround for a bug in tar on Ultrix 4.2.
+## Note that we copy DOC* and then delete DOC
+## as a workaround for a bug in tar on Ultrix 4.2.
 install-arch-indep: mkdir
 	-set ${COPYDESTS} ; \
 	for dir in ${COPYDIR} ; do \
@@ -314,7 +320,8 @@ install-arch-indep: mkdir
 	  [ -d $${dir} ] \
 	  && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
 	  && (echo "Copying $${dir} to $${dest}..." ; \
-	      (cd $${dir}; tar -cf - . )|(cd $${dest};umask 022; tar -xvf - ); \
+	      (cd $${dir}; tar -cf - . ) \
+		|(cd $${dest};umask 022; tar -xvf - && cat > /dev/null); \
 	      for subdir in `find $${dest} -type d ! -name RCS -print` ; do \
 		rm -rf $${subdir}/RCS ; \
 		rm -rf $${subdir}/CVS ; \
@@ -333,15 +340,18 @@ install-arch-indep: mkdir
 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
 	then \
 	   echo "Copying etc/DOC-* to ${docdir} ..." ; \
-	   (cd ./etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
+	   (cd ./etc; tar -cf - DOC*) \
+	     |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null); \
 	   (cd $(docdir); chmod a+r DOC*; rm DOC) \
 	else true; fi
 	if [ -r ./lisp ] \
+	   && [ -r ./lisp/simple.el ] \
 	   && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
 	   && [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
 	then \
 	   echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
-	   (cd lisp; tar -cf - *.el *.elc)|(cd ${lispdir}; umask 0; tar -xvf - ); \
+	   (cd lisp; tar -cf - *.el *.elc) \
+	     |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null); \
 	else true; fi
 	thisdir=`/bin/pwd`; \
 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
@@ -354,7 +364,7 @@ install-arch-indep: mkdir
 	   cd ${srcdir}/info ; \
 	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
 	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
-	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip* widget*; do \
 	     (cd $${thisdir}; \
 	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
 	      chmod a+r ${infodir}/$$f); \
@@ -368,6 +378,13 @@ install-arch-indep: mkdir
 	   chmod a+r ${man1dir}/$${page}${manext}); \
 	done
 
+### Install LEIM files.  Although they are machine-independent, we
+### have separate target here instead of including it in
+### `install-arch-indep'.  People who extracted LEIM files after they
+### insalled Emacs itself can install only LEIM files by this target.
+install-leim: leim/Makefile mkdir
+	cd leim; $(MAKE) install
+
 ### Build Emacs and install it, stripping binaries while installing them.
 install-strip:
 	$(MAKE) INSTALL_STRIP=-s
@@ -377,10 +394,9 @@ install-strip:
 ### /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
-	$(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${infodir} ${man1dir} \
+	$(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \
 	  ${bindir} ${datadir} ${docdir} ${libexecdir} \
 	  `echo ${locallisppath} | sed 's/:/ /g'`
-	-chmod a+rwx ${lockdir}
 
 ### Delete all the installed files that the `install' target would
 ### create (but not the noninstalled files such as `make all' would
@@ -427,6 +443,7 @@ mostlyclean: FRC
 	(cd lwlib;    $(MAKE) $(MFLAGS) mostlyclean)
 	(cd lib-src;  $(MAKE) $(MFLAGS) mostlyclean)
 	-(cd man &&   $(MAKE) $(MFLAGS) mostlyclean)
+	(cd leim;     $(MAKE) $(MFLAGS) mostlyclean)
 
 ### `clean'
 ###      Delete all files from the current directory that are normally
@@ -442,6 +459,7 @@ clean: FRC
 	(cd lwlib;    $(MAKE) $(MFLAGS) clean)
 	(cd lib-src;  $(MAKE) $(MFLAGS) clean)
 	-(cd man &&   $(MAKE) $(MFLAGS) clean)
+	(cd leim;     $(MAKE) $(MFLAGS) clean)
 
 ### `distclean'
 ###      Delete all files from the current directory that are created by
@@ -452,13 +470,14 @@ clean: FRC
 top_distclean=\
 	rm -f config.status config.cache config.log ; \
 	rm -f Makefile ${SUBDIR_MAKEFILES} ; \
-	(cd lock && (rm * || true))
+	(cd lock && (rm -f * || true))
 distclean: FRC
 	(cd src;      $(MAKE) $(MFLAGS) distclean)
 	(cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
 	(cd lwlib;    $(MAKE) $(MFLAGS) distclean)
 	(cd lib-src;  $(MAKE) $(MFLAGS) distclean)
 	(cd man &&    $(MAKE) $(MFLAGS) distclean)
+	(cd leim;     $(MAKE) $(MFLAGS) distclean)
 	${top_distclean}
 
 ### `maintainer-clean'
@@ -478,6 +497,7 @@ maintainer-clean: FRC
 	(cd lwlib;    $(MAKE) $(MFLAGS) maintainer-clean)
 	(cd lib-src;  $(MAKE) $(MFLAGS) maintainer-clean)
 	-(cd man &&   $(MAKE) $(MFLAGS) maintainer-clean)
+	(cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
 	${top_distclean}
 
 ### This doesn't actually appear in the coding standards, but Karl
@@ -506,7 +526,7 @@ SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \
 .PHONY: unlock relock
 
 unlock:
-	chmod u+w $(SOURCES) cpp/*
+	chmod u+w $(SOURCES)
 	-(cd elisp; chmod u+w Makefile README *.texi)
 	(cd etc; $(MAKE) $(MFLAGS) unlock)
 	(cd lib-src; $(MAKE) $(MFLAGS) unlock)
@@ -518,7 +538,7 @@ unlock:
 	(cd src; $(MAKE) $(MFLAGS) unlock)
 
 relock:
-	chmod u-w $(SOURCES) cpp/*
+	chmod u-w $(SOURCES)
 	-(cd elisp; chmod u-w Makefile README *.texi)
 	(cd etc; $(MAKE) $(MFLAGS) relock)
 	(cd lib-src; $(MAKE) $(MFLAGS) relock)
@@ -529,8 +549,10 @@ relock:
 	(cd lwlib; chmod u+w *.[ch] Makefile README)
 	(cd src; $(MAKE) $(MFLAGS) relock)
 
-TAGS tags:	lib-src
-	cd ${srcdir}/src; $(MAKE) tags
+TAGS tags:	lib-src src
+	# The src subdir knows how to do the right thing
+	# even when the build directory and source dir are different.
+	cd src; $(MAKE) tags
 
 check:
 	@echo "We don't have any tests for GNU Emacs yet."