Took care of scripts and support.

Makefile.am

@@ -13,13 +13,12 @@ noinst_PROGRAMS =
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 nobase_pkginclude_HEADERS =
-noinst_HEADERS=
+noinst_HEADERS =
+EXTRA_DIST = 
 
 
 SUBDIRS = \
 	. \
-	scripts \
-	support \
 	tests
 
 include benchmark/include.am
@@ -30,12 +29,20 @@ include libgearman/include.am
 include libgearman-server/include.am
 include docs/man_list
 
-EXTRA_DIST= \
+EXTRA_DIST+= \
 	docs/Doxyfile.api \
 	docs/Doxyfile.dev \
 	docs/api_header.html \
 	docs/dev_header.html \
-	docs/doxygen.h
+	docs/doxygen.h \
+  scripts/gearmand-init \
+	scripts/gearmand.xml \
+	scripts/gearmand \
+	scripts/README.solaris \
+	support/gearmand.spec
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = support/gearmand.pc
 
 docs: all
 	${DOXYGEN} docs/Doxyfile.api

benchmark/include.am

@@ -16,7 +16,7 @@ noinst_PROGRAMS+= \
 	benchmark/blobslap_worker
 
 noinst_HEADERS+= \
-	benchmark.h
+	benchmark/benchmark.h
 
 noinst_LTLIBRARIES+= benchmark/libbenchmark.la
 benchmark_libbenchmark_la_SOURCES= benchmark/benchmark.c

configure.ac

@@ -64,8 +64,6 @@ AC_CHECK_HEADERS(sys/socket.h sys/types.h sys/utsname.h unistd.h strings.h)
 
 AC_CONFIG_FILES(Makefile
                 tests/Makefile
-                scripts/Makefile
-                support/Makefile
                 scripts/gearmand-init
                 scripts/gearmand.xml
                 scripts/gearmand

scripts/Makefile.am

@@ -1,8 +0,0 @@
-# Gearman server and library
-# Copyright (C) 2008 Brian Aker, Eric Day
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in this directory for full text.
-
-EXTRA_DIST= gearmand-init gearmand.xml gearmand README.solaris

support/Makefile.am

@@ -1,11 +0,0 @@
-# Gearman server and library
-# Copyright (C) 2008 Brian Aker, Eric Day
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in this directory for full text.
-
-EXTRA_DIST = gearmand.spec
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gearmand.pc