--- a/Makefile.in	Mon Aug 13 10:25:39 2007 +0200
+++ b/Makefile.in	Mon Aug 13 10:26:29 2007 +0200
@@ -152,10 +152,17 @@
 ## --datadir flag at configuration time.
 lispdir_user_defined=@lispdir_user_defined@
 
-## Directories XEmacs should search for lisp files specific
+## Where packages are found.
+packagepath=@packagepath@
+
+## This is set to 'yes' if the user specified the --package_path
+## at configuration time.
+packagepath_user_defined=@packagepath_user_defined@
+
+
+## Directory XEmacs should search for lisp files specific
 ## to this site (i.e. customizations), before consulting
-## ${lispdir}.  This should be a colon-separated list of
-## directories.
+## ${lispdir}.
 sitelispdir=@sitelispdir@
 
 ## Where XEmacs will search for its lisp files while
@@ -304,6 +311,14 @@
 	   then echo    '#define PATH_LOADSEARCH "${lispdir}"'; \
 	   else echo '/* #define PATH_LOADSEARCH "${lispdir}" */'; \
 	 fi; \
+	 if test "${packagepath_user_defined}" = "yes"; \
+	   then echo    '#define PATH_PACKAGEPATH "${packagepath}"'; \
+	   else echo '/* #define PATH_PACKAGEPATH "${packagepath}" */'; \
+	 fi; \
+	 if test "${sitelispdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_SITE "${sitelispdir}"'; \
+	   else echo '/* #define PATH_SITE "${sitelispdir}" */'; \
+	 fi; \
 	 if test "${archlibdir_user_defined}" = "yes"; \
 	   then echo    '#define PATH_EXEC "${archlibdir}"'; \
 	   else echo '/* #define PATH_EXEC "${archlibdir}" */'; \
@@ -571,7 +586,8 @@
 	  $(RM) $$d/Makefile $$d/Makefile.in ; \
 	done ; \
 	$(RM) core .sbinit Makefile lock/*; \
-	$(RM) lisp/finder-inf.el* Installation.el Installation.elc
+	$(RM) lisp/finder-inf.el* Installation.el Installation.elc; \
+	$(RM) packages mule-packages
 
 distclean: FRC.distclean
 	for d in $(SUBDIR); do (cd $$d && $(RECURSIVE_MAKE) $@); done