--- a/src/Makefile.in.in	Mon Aug 13 09:57:40 2007 +0200
+++ b/src/Makefile.in.in	Mon Aug 13 09:58:30 2007 +0200
@@ -27,7 +27,7 @@
 
 ## For performance and consistency, no built-in rules.
 .SUFFIXES:
-.SUFFIXES: .c .o .i .h
+.SUFFIXES: .c .o .i .h .dep
 
 @SET_MAKE@
 SHELL=/bin/sh
@@ -125,7 +125,11 @@
 cflags   = $(CFLAGS) $(cppflags)
 ldflags  = $(ld_switch_all)
 
+#ifdef SOLARIS2
+%.o : %.c
+#else
 .c.o:
+#endif
 	$(CC) -c $(cflags) $<
 
 ## Create preprocessor output (debugging purposes only)
@@ -288,7 +292,9 @@
 xemacs: temacs ${libsrc}DOC $(mo_file) ${other_files} update-elc.stamp
 	@$(RM) $@ && touch SATISFIED
 	-$(DUMPENV) ./temacs -batch -l loadup.el dump
-	@if test -f $@;        then $(RM) SATISFIED; exit 0; fi; \
+	@if test -f $@;        then if test -f SATISFIED; then \
+		./xemacs -q -batch -f list-load-path-shadows; fi; \
+		$(RM) SATISFIED; exit 0; fi; \
 	 if test -f SATISFIED; then $(RM) SATISFIED; exit 1; fi; \
 	 $(RECURSIVE_MAKE) $@;
 
@@ -559,7 +565,7 @@
 ## users of alloca in Emacs.  Check out ../lib-src/getopt.c.  */
 
 alloca.o : ${srcdir}/alloca.c
-	$(CC) -c -Dfree=xfree -Dmalloc=xmalloc $(cflags) $<
+	$(CC) -c -Dfree=xfree -Dmalloc=xmalloc $(cflags) ${srcdir}/alloca.c
 #else
 #ifndef HAVE_ALLOCA
 alloca.o : ${srcdir}/alloca.s config.h
@@ -593,14 +599,14 @@
 
 #ifdef ENERGIZE
 energize.o: ${srcdir}/energize.c
-	$(CC) -c $(cppflags) $(cflags) $(BTL_includes) $<
+	$(CC) -c $(cppflags) $(cflags) $(BTL_includes) ${srcdir}/energize.c
 #endif /* ENERGIZE */
 
 #ifdef HAVE_NATIVE_SOUND
 sunplay.o: ${srcdir}/sunplay.c
-	$(CC) -c  $(sound_cflags) $(cflags) $<
+	$(CC) -c  $(sound_cflags) $(cflags) ${srcdir}/sunplay.c
 hpplay.o: ${srcdir}/hpplay.c
-	$(CC) -c -Demacs $(sound_cflags) $(cflags) $<
+	$(CC) -c -Demacs $(sound_cflags) $(cflags) ${srcdir}/hpplay.c
 #endif /* HAVE_NATIVE_SOUND */
 
 ## System-specific programs to be made.
@@ -639,8 +645,6 @@
 .c.dep:
 	$(CC) -MM $(cflags) $< > $*.dep
 
-.SUFFIXES: .dep
-
 obj_dep = $(objs:.o=.dep)
 
 .PHONY : depend gnu-depend