--- a/ChangeLog	Wed Nov 28 16:55:11 2007 +0000
+++ b/ChangeLog	Thu Nov 29 13:48:56 2007 +0000
@@ -1,3 +1,9 @@
+2007-11-29  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	Clean up of property file inclusion and
+	fix for version.properties.
+	
 2007-11-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* Makefile.am,

--- a/Makefile.am	Wed Nov 28 16:55:11 2007 +0000
+++ b/Makefile.am	Thu Nov 29 13:48:56 2007 +0000
@@ -104,7 +104,7 @@
 	  cp -p $$file $(distdir)/$$f; \
 	done
 
-$(srcdir)/com/sun/tools/javac/resources/version.properties: \
+classes/com/sun/tools/javac/resources/version.properties: \
 		$(OPENJDK_CLASSES)/com/sun/tools/javac/resources/version.properties-template
 	$(MKDIR) -p $(@D)
 	$(SED) 	-e 's/$$(JDK_VERSION)/$(JDK_VERSION)/'  \
@@ -112,43 +112,26 @@
 		-e 's/$$(RELEASE)/$(RELEASE)/' \
 		< $< > $@
 
-# To generate the example zip just depend on the sources and ignore
-# the class files. Always regenerate all .class files and remove them
-# immediately.  And copy the template files we use to the classes dir
+# Always regenerate all .class files and remove them
+# immediately.  And copy the property files to the classes dir
 # so they get also included.
-$(TOOLS_ZIP): $(TOOLS_JAVA_FILES) $(srcdir)/com/sun/tools/javac/resources/version.properties 
-	@rm -rf classes 
-	$(MKDIR) classes 
-#	$(FIND) $(srcdir)/com $(srcdir)/javax \
-#	     -name '*.java' -print > classes.lst
+$(TOOLS_ZIP): $(TOOLS_JAVA_FILES) classes/com/sun/tools/javac/resources/version.properties 
 	echo $(TOOLS_JAVA_FILES) > classes.lst
 	$(JCOMPILER) -g -d classes @classes.lst
-## Copy over tools resource files.
-#mkdir classes/com/sun/tools/apt/resources
-#mkdir classes/com/sun/tools/javah/resources
-#mkdir classes/com/sun/tools/javah/oldjavah/resources
-#mkdir classes/com/sun/tools/javadoc/resources
+## Copy over resource files.
 	@list=`cd $(OPENJDK_CLASSES) && $(FIND) com/sun/tools/{javac,javadoc,apt,javah,doclets} -name \*\.properties -print`; cd $(top_srcdir); for p in $$list; do \
           dirname=`dirname $$p`; \
           if ! test -d classes/"$$dirname"; then mkdir -p classes/"$$dirname"; fi; \
 	  cp $(OPENJDK_CLASSES)/$$p classes/$$p; \
 	done
-	@list=`cd $(OPENJDK_CLASSES)/com/sun/tools/jdi && $(FIND) META-INF -name CVS -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \
-          dirname=`dirname $$p`; \
-          if ! test -d classes/"$$dirname"; then mkdir -p classes/"$$dirname"; fi; \
-	  cp $(OPENJDK_CLASSES)/com/sun/tools/jdi/$$p classes/$$p; \
-	done
 ## First add classpath tools stuff.
 	(cd classes; \
 	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \
 	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \
 	cd ..)
-#rm -rf classes
+	@rm -rf classes 
 
 # Zip file be gone! (and make sure the classes are gone too)
 clean-local:
 	rm -rf $(TOOLS_ZIP) classes classes.lst
 
-# FIXME: remove this when GNU Classpath includes a bootstrap VM.
-installcheck-binSCRIPTS:
-	: