--- a/Makefile.in	Mon Aug 13 09:53:23 2007 +0200
+++ b/Makefile.in	Mon Aug 13 09:54:23 2007 +0200
@@ -218,7 +218,7 @@
 ## instead, we have written out explicit code in the `install' targets.
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
-GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize_adjust.h src/config.h lwlib/config.h
+GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize-adjust.h src/config.h lwlib/config.h
 
 all:	${GENERATED_HEADERS} ${MAKE_SUBDIR}
 
@@ -294,8 +294,8 @@
 	  /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
 	  src/Emacs.ad.h
 
-src/puresize_adjust.h:	${srcdir}/src/puresize.h
-	@echo "Resetting \`src/puresize_adjust.h'."; \
+src/puresize-adjust.h:	${srcdir}/src/puresize.h
+	@echo "Resetting \`src/puresize-adjust.h'."; \
 	(echo "/*	Do not edit this file!" ; \
 	 echo "  	Automatically generated by XEmacs */" ; \
 	 echo "#define PURESIZE_ADJUSTMENT 0") > $@
@@ -414,12 +414,12 @@
 	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
 	    chmod 0644 ${mandir}/$${page}${manext} ; \
 	  done
-	if test ! -d ${prefix}/bin; then \
+	if test "${prefix}" != "${exec_prefix}"; then : extreme bogosity follows; \
+	   test ! -d ${prefix}/bin && \
 		$(LN_S) ${exec_prefix}/bin ${prefix}/bin; \
-	fi
-	if test ! -d ${prefix}/lib/xemacs-${version}/${configuration}; then \
+	   test ! -d ${prefix}/lib/xemacs-${version}/${configuration} && \
 		${LN_S} ${exec_prefix}/lib/xemacs-${version}/${configuration} \
-			${prefix}/lib/xemacs-${version}/${configuration}; \
+			     ${prefix}/lib/xemacs-${version}/${configuration}; \
 	fi
 	@echo "If you would like to save approximately 15M of disk space, do"
 	@echo "make gzip-el"
@@ -432,13 +432,13 @@
 	lib-src/gzip-el.sh ${lispdir}
 
 MAKEPATH=./lib-src/make-path
-## Build all the directories we're going to install XEmacs in.	Since
-## we may be creating several layers of directories (for example,
-## /usr/local/lib/xemacs-19.13/mips-dec-ultrix4.2), we use make-path
-## instead of mkdir.  Not all systems' mkdirs have the `-p' flag.
+## Build all the directories to install XEmacs in.
+## Since we may be creating several layers of directories,
+## (e.g. /usr/local/lib/xemacs-20.5/sparc-sun-solaris2.6), we use
+## make-path instead of mkdir.  Not all mkdirs have the `-p' flag.
 mkdir: FRC.mkdir
-	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
-	  ${bindir} ${datadir} ${libdir} ${sitelispdir} ${pkdir}
+	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
+	  ${mandir} ${bindir} ${datadir} ${libdir} ${sitelispdir} ${pkgdir}
 	-chmod 0777 ${lockdir}
 
 ## Delete all the installed files that the `install' target would