X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/9abb2056be8b65292a2e7ffe922bf071d900b05e..fa4b4cfd927cee35ff481c5db54544348db6aba6:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3c2c8fb1bf..d65e40fec5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -243,10 +243,10 @@ blessmail: ${SUBDIR_MAKEFILES} src FRC
 Makefile: $(srcdir)/Makefile.in config.status
 	./config.status
 
-config.status: configure
+config.status: ${srcdir}/configure
 	./config.status --recheck
 
-${srcdir}/configure: configure.in
+${srcdir}/configure: configure.in aclocal.m4
 	cd ${srcdir} && autoconf
 
 src/Makefile: $(srcdir)/src/Makefile.in config.status
@@ -305,9 +305,11 @@ install-arch-dep: mkdir
 	-chmod 1755  ${bindir}/emacs-${version}
 	rm -f ${bindir}/$(EMACS)
 	-ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
-	unset CDPATH; \
+	-unset CDPATH; \
 	for f in `cd lib-src && echo fns-*.el`; do \
-	  ${INSTALL_DATA} lib-src/$$f ${archlibdir}/$$f; \
+	  if test -r lib-src/$$f ; then \
+	    ${INSTALL_DATA} lib-src/$$f ${archlibdir}/$$f; \
+	  else true; fi ; \
 	done
 
 ### Install the files that are machine-independent.
@@ -337,7 +339,7 @@ install-arch-indep: mkdir info
 	  && (echo "Copying $${dir} to $${dest}..." ; \
 	      (cd $${dir}; tar -cf - . ) \
 		|(cd $${dest};umask 022; tar -xvf - && cat > /dev/null); \
-	      for subdir in `find $${dest} -type d ! -name RCS -print` ; do \
+	      for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
 		chmod a+rx $${subdir} ; \
 		rm -rf $${subdir}/RCS ; \
 		rm -rf $${subdir}/CVS ; \
@@ -368,7 +370,7 @@ install-arch-indep: mkdir info
 	    > ${datadir}/emacs/site-lisp/subdirs.el; \
 	fi
 	-chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
-	unset CDPATH; \
+	-unset CDPATH; \
 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
 	then \
 	   echo "Copying etc/DOC-* to ${docdir} ..." ; \
@@ -376,7 +378,7 @@ install-arch-indep: mkdir info
 	     |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null); \
 	   (cd $(docdir); chmod a+r DOC*; rm DOC); \
 	else true; fi
-	unset CDPATH; \
+	-unset CDPATH; \
 	if [ -r ./lisp ] \
 	   && [ -r ./lisp/simple.el ] \
 	   && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
@@ -386,7 +388,7 @@ install-arch-indep: mkdir info
 	   (cd lisp; tar -cf - *.el *.elc) \
 	     |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null); \
 	else true; fi
-	unset CDPATH; \
+	-unset CDPATH; \
 	thisdir=`/bin/pwd`; \
 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
 	then \
@@ -398,7 +400,7 @@ install-arch-indep: mkdir info
 	      chmod a+r ${infodir}/dir); \
 	   fi; \
 	   cd ${srcdir}/info ; \
-	   for f in ada-mode* autotype* ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* reftex* sc* vip* widget*; do \
+	   for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \
 	     (cd $${thisdir}; \
 	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
 	      chmod a+r ${infodir}/$$f); \
@@ -408,9 +410,9 @@ install-arch-indep: mkdir info
 	thisdir=`/bin/pwd`; \
 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
 	then \
-	  for f in ada-mode autotype ccmode cl dired-x ediff emacs emacs-faq.info forms gnus info message mh-e reftex sc vip viper widget; do \
+	  for f in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \
 	    (cd $${thisdir}; \
-	     ${INSTALL_INFO} --dir-file=${infodir}/dir --info-file=${infodir}/$$f); \
+	     ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
 	  done; \
 	else true; fi
 	-chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
@@ -458,7 +460,7 @@ uninstall:
 	 $(MAKE) $(MFLAGS) uninstall			\
 	    prefix=${prefix} exec_prefix=${exec_prefix}	\
 	    bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir})
-	unset CDPATH; \
+	-unset CDPATH; \
 	for dir in ${lispdir} ${etcdir} ; do 		\
 	  if [ -d $${dir} ]; then			\
 	    case `(cd $${dir} ; /bin/pwd)` in		\
@@ -529,6 +531,7 @@ distclean: FRC
 	(cd lib-src;  $(MAKE) $(MFLAGS) distclean)
 	(cd man &&    $(MAKE) $(MFLAGS) distclean)
 	(cd leim;     $(MAKE) $(MFLAGS) distclean)
+	(cd lisp;     $(MAKE) $(MFLAGS) distclean)
 	${top_distclean}
 
 ### `maintainer-clean'
@@ -600,23 +603,24 @@ relock:
 	(cd lwlib; chmod u+w *.[ch] Makefile README)
 	(cd src; $(MAKE) $(MFLAGS) relock)
 
-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.
+# The src subdir knows how to do the right thing
+# even when the build directory and source dir are different.
+TAGS tags:
+	lib-src src
 	cd src; $(MAKE) tags
 
 check:
 	@echo "We don't have any tests for GNU Emacs yet."
 
 dist:
-	cd ${srcdir}; make-dist
+	cd ${srcdir}; ./make-dist
 
-.PHONY: info dvi dist check
+.PHONY: info dvi dist check html
 force-info:
+# Note that man/Makefile knows how to
+# put the info files in $(srcdir),
+# so we can do ok running make in the build dir.
 info: force-info
-	# Note that man/Makefile knows how to
-	# put the info files in $(srcdir),
-	# so we can do ok running make in the build dir.
 	(cd man; $(MAKE) $(MFLAGS) info)
 dvi:
 	(cd man; $(MAKE) $(MFLAGS) dvi)
@@ -628,10 +632,13 @@ dvi:
 ### special emacs executable is built from Lisp sources, which is then
 ### used to compile Lisp files.  The last step is a "normal" make.
 
-bootstrap: clean
+bootstrap: clean bootstrap-lisp-1 bootstrap-src bootstrap-lisp clean all info
+
+bootstrap-lisp-1:
 	(cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
-	(cd src; $(MAKE) $(MFLAGS) bootstrap)
+
+bootstrap-lisp:
 	-(cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs)
-	$(MAKE) $(MFLAGS) clean
-	$(MAKE) $(MFLAGS)
 
+bootstrap-src:
+	(cd src; $(MAKE) $(MFLAGS) bootstrap)