Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.10
diff -u -3 -p -r1.10 Makefile.am
--- Makefile.am	4 Feb 2006 19:57:37 -0000	1.10
+++ Makefile.am	5 Feb 2006 13:51:11 -0000
@@ -15,14 +15,14 @@ ACLOCAL_AMFLAGS = -I macros
 
 STD_DIRS = libbase libgeometry server backend utilities
 if PLUGIN
-PLUG_DIR = $(STD_DIRS) plugin
+PLUG_DIR = plugin
 endif
 if DOCBOOK
-DOC_DIRS += $(STD_DIRS) doc
+DOC_DIRS = doc
 endif
-SUBDIRS = $(STD_DIRS) $(PLUG_DIR)
-DIST_SUBDIRS = $(STD_DIRS)  $(PLUG_DIR) $(DOC_DIRS) testsuite
-EXTRA_DIST = macros
+SUBDIRS = $(STD_DIRS) $(PLUG_DIR) $(DOC_DIRS)
+DIST_SUBDIRS = $(STD_DIRS) $(PLUG_DIR) $(DOC_DIRS) testsuite
+
 # if HTTP
 # SUBDIRS += net $(STD_DIRS)
 # else