--- Makefile.in.orig	Thu Feb 19 11:14:30 1998
+++ Makefile.in	Sat Oct 10 23:28:59 1998
@@ -155,6 +155,10 @@
 ## directories.
 sitelispdir=@sitelispdir@
 
+## This is set to 'yes' if the user specified the --lispdir or
+## --datadir flag at configuration time.
+sitelispdir_user_defined=@sitelispdir_user_defined@
+
 ## Where XEmacs will search for its lisp files while
 ## building.  This is only used during the process of
 ## compiling XEmacs, to help XEmacs find its lisp files
@@ -295,9 +299,9 @@
 	@cp ${srcdir}/src/paths.h.in src/paths.h.tmp
 	@-chmod 0644 src/paths.h.tmp
 	@(echo '#define PATH_PREFIX "${prefix}"'; \
-	 if test "${lispdir_user_defined}" = "yes"; \
-	   then echo    '#define PATH_LOADSEARCH "${lispdir}"'; \
-	   else echo '/* #define PATH_LOADSEARCH "${lispdir}" */'; \
+	 if test "${sitelispdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_LOADSEARCH "${sitelispdir}"'; \
+	   else echo '/* #define PATH_LOADSEARCH "${sitelispdir}" */'; \
 	 fi; \
 	 if test "${archlibdir_user_defined}" = "yes"; \
 	   then echo    '#define PATH_EXEC "${archlibdir}"'; \
@@ -485,7 +489,8 @@
 ## make-path instead of mkdir.  Not all mkdirs have the `-p' flag.
 mkdir: FRC.mkdir
 	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
-	  ${mandir} ${bindir} ${datadir} ${libdir} ${sitelispdir} ${pkgdir}
+	  ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \
+	  `echo ${sitelispdir} | sed 's/:/ /g'`
 	-chmod 0777 ${lockdir}
 
 ## Delete all the installed files that the `install' target would
