diff Makefile.in @ 7390:989492b57d5e

(install-arch-indep): Do install info/dired-x*. Merge code in from install-doc. (install-doc): Merge code back into install-arch-indep. (install-arch-dep): Don't depend on install-doc.

--- a/Makefile.in	Sat May 07 03:14:53 1994 +0000
+++ b/Makefile.in	Sat May 07 03:15:33 1994 +0000
@@ -270,10 +270,7 @@
 
 ### Note that we copy the DOC-* files from the build etc directory
 ### as well as lots of things from ${srcdir}/etc.
-
-## The docfile isn't really architecture-dependent, but we want to
-## install it along with the version of Emacs that it's keyed to.
-install-arch-dep: mkdir install-doc
+install-arch-dep: mkdir
 	(cd lib-src; \
 	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
 	    exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
@@ -283,13 +280,8 @@
 	rm -f ${bindir}/$(EMACS)
 	-ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
 
-install-doc: mkdir
-	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
-	then \
-	   echo "Copying etc/DOC* ..." ; \
-	   (cd etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
-	else true; fi
-
+### Note that we copy the DOC-* files from the build etc directory
+### as well as lots of things from ${srcdir}/etc.
 install-arch-indep: mkdir
 	-set ${COPYDESTS} ; \
 	 for dir in ${COPYDIR} ; do \
@@ -313,6 +305,11 @@
 		 rm -f  $${subdir}/*~ ; \
 	       done) ; \
 	 done
+	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
+	then \
+	   echo "Copying etc/DOC* ..." ; \
+	   (cd etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
+	else true; fi
 	thisdir=`pwd`; \
 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
 	then \
@@ -320,7 +317,7 @@
 	   if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
 	     (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
 	   fi ; \
-	   for f in cl* emacs* forms* gnus* info* sc* vip* ; do \
+	   for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* ; do \
 	     (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
 	   done); \
 	else true; fi