--- a/Makefile.in	Mon Aug 13 10:16:17 2007 +0200
+++ b/Makefile.in	Mon Aug 13 10:17:07 2007 +0200
@@ -424,17 +424,14 @@
 	-chmod 0755 ${bindir}/${progname}-${version}
 	cd ${bindir} && $(RM) ./xemacs && ${LN_S} ${progname}-${version} ./xemacs
 	if test "${prefix}" != "${exec_prefix}"; then \
-           test ! -d ${exec_prefix}/lib/xemacs && \
-                $(LN_S) ${prefix}/lib/xemacs ${exec_prefix}/lib/xemacs; \
-           test ! -d ${exec_prefix}/lib/${progname}-${version}/etc && \
-                $(LN_S) ${prefix}/lib/${progname}-${version}/etc \
-                        ${exec_prefix}/lib/${progname}-${version}/etc; \
-           test ! -d ${exec_prefix}/lib/${progname}-${version}/info && \
-                $(LN_S) ${prefix}/lib/${progname}-${version}/info \
-                        ${exec_prefix}/lib/${progname}-${version}/info; \
-           test ! -d ${exec_prefix}/lib/${progname}-${version}/lisp && \
-                $(LN_S) ${prefix}/lib/${progname}-${version}/lisp \
-                        ${exec_prefix}/lib/${progname}-${version}/lisp; \
+	  for dir in \
+		lib/xemacs \
+	 	lib/${progname}-${version}/etc \
+		lib/${progname}-${version}/info \
+		lib/${progname}-${version}/lisp; do \
+	    if test ! -d ${exec_prefix}/$${dir}; then \
+	      $(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \
+	  done; \
 	fi
 
 install-arch-indep: mkdir info
@@ -488,7 +485,7 @@
 MAKEPATH=./lib-src/make-path
 ## Build all the directories to install XEmacs in.
 ## Since we may be creating several layers of directories,
-## (e.g. /usr/local/lib/${progname}20.5/sparc-sun-solaris2.6), we use
+## (e.g. /usr/local/lib/${progname}-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} ${archlibdir} \