Index: java/util/logging/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/Makefile.am,v
retrieving revision 1.3
diff -u -b -B -r1.3 Makefile.am
--- java/util/logging/Makefile.am	22 Jan 2004 10:48:49 -0000	1.3
+++ java/util/logging/Makefile.am	30 Jan 2004 22:08:19 -0000
@@ -1,9 +1,7 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = 
-
 propertiesdir = $(libdir)
-properties_DATA = logging.properties
+dist_properties_DATA = logging.properties
 
 EXTRA_DIST = \
 ConsoleHandler.java \
Index: native/jni/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/Makefile.am,v
retrieving revision 1.7
diff -u -b -B -r1.7 Makefile.am
--- native/jni/Makefile.am	2 Jul 2003 09:16:52 -0000	1.7
+++ native/jni/Makefile.am	30 Jan 2004 22:08:19 -0000
@@ -1,8 +1,9 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
 if CREATE_GTK_PEER_LIBRARIES
-SUBDIRS = classpath java-io java-lang java-net java-nio java-util gtk-peer
-else
-SUBDIRS = classpath java-io java-lang java-net java-nio java-util
+  GTKDIR = gtk-peer
 endif
+
+SUBDIRS = classpath java-io java-lang java-net java-nio java-util $(GTKDIR)
+DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util gtk-peer
 
Index: native/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/Makefile.am,v
retrieving revision 1.22
diff -u -b -B -r1.22 Makefile.am
--- native/Makefile.am	14 Aug 2003 16:58:44 -0000	1.22
+++ native/Makefile.am	30 Jan 2004 22:08:19 -0000
@@ -1,16 +1,13 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-if CREATE_JNI_LIBRARIES
-
 if CREATE_CNI_LIBRARIES
-SUBDIRS = fdlibm cni jni target
-else
-SUBDIRS = fdlibm jni target
+  CNIDIR = cni
 endif
 
-else
-if CREATE_CNI_LIBRARIES
-SUBDIRS = fdlibm cni target
-endif
+if CREATE_JNI_LIBRARIES
+  JNIDIR = jni
 endif
+
+SUBDIRS = fdlibm $(CNIDIR) $(JNIDIR) target
+DIST_SUBDIRS = fdlibm cni jni target
 
Index: resource/java/security/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/resource/java/security/Makefile.am,v
retrieving revision 1.3
diff -u -b -B -r1.3 Makefile.am
--- resource/java/security/Makefile.am	24 Dec 2002 05:35:23 -0000	1.3
+++ resource/java/security/Makefile.am	30 Jan 2004 22:08:19 -0000
@@ -1,15 +1,8 @@
 ## used by automake to generate Makefile.in
 
-EXTRA_DIST = \
-classpath.security
-
 # this may be a broken way to install, this file must be in 
 # java.home/lib/security
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)/security
-	$(INSTALL_DATA) $(srcdir)/classpath.security $(DESTDIR)$(libdir)/security/classpath.security
-
-uninstall-local:
-	rm -f $(DESTDIR)$(libdir)/security/classpath.security
+securitydir = $(libdir)/security
+dist_security_DATA = classpath.security