From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 13 May 2009 19:04:53 +0000 (-0700)
Subject: Fixed files to work with vpath builds for distcheck.
X-Git-Tag: 0.29-2~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=259796df2149b11286d58158255f868cadb470bb;p=m6w6%2Flibmemcached

Fixed files to work with vpath builds for distcheck.
---

diff --git a/Makefile.am b/Makefile.am
index 95382924..446e8ae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I config
-INCLUDES = 
+
 SUBDIRS = docs libmemcached libmemcachedutil tests support clients
 EXTRA_dist = README.FIRST
 
diff --git a/clients/Makefile.am b/clients/Makefile.am
index 23debed1..05082b16 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,4 +1,3 @@
-INCLUDES = -I$(top_builddir)
 LDADDS = $(top_builddir)/libmemcached/libmemcached.la
 
 bin_PROGRAMS = memcat memcp memstat memrm memflush memslap memerror
diff --git a/clients/execute.h b/clients/execute.h
index fc041312..75ab66c5 100644
--- a/clients/execute.h
+++ b/clients/execute.h
@@ -1,4 +1,4 @@
-#include <memcached.h>
+#include "libmemcached/memcached.h"
 #include "generator.h"
 
 unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of);
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 04803b76..5b051580 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = include
+CLEANFILES= *.1 *.3
+
 
 EXTRA_DIST = libmemcached.pod\
 	libmemcachedutil.pod\
@@ -102,272 +103,264 @@ endif
 
 
 libmemcached.3: libmemcached.pod 
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 libmemcached.pod > libmemcached.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/libmemcached.pod > libmemcached.3
 
 libmemcachedutil.3: libmemcachedutil.pod 
-	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 libmemcachedutil.pod > libmemcachedutil.3
+	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/libmemcachedutil.pod > libmemcachedutil.3
 
 libmemcached_examples.3: libmemcached_examples.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 libmemcached_examples.pod > libmemcached_examples.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/libmemcached_examples.pod > libmemcached_examples.3
 
 memcached_create.3: memcached_create.pod 
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_create.pod > memcached_create.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_create.pod > memcached_create.3
 
 memcached_free.3: memcached_create.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_create.pod > memcached_free.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_create.pod > memcached_free.3
 
 memcached_clone.3: memcached_create.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_create.pod > memcached_clone.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_create.pod > memcached_clone.3
 
 memcached_set.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_set.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_set.3
 
 memcached_set_by_key.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_set_by_key.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_set_by_key.3
 
 memcached_cas.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_cas.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_cas.3
 
 memcached_cas_by_key.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_cas_by_key.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_cas_by_key.3
 
 memcached_replace.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_replace.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_replace.3
 
 memcached_replace_by_key.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_replace_by_key.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_replace_by_key.3
 
 memcached_add.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_add.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_add.3
 
 memcached_add_by_key.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_add_by_key.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_add_by_key.3
 
 memcached_prepend.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_prepend.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_prepend.3
 
 memcached_prepend_by_key.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_prepend_by_key.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_prepend_by_key.3
 
 memcached_append.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_append.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_append.3
 
 memcached_append_by_key.3: memcached_set.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_set.pod > memcached_append_by_key.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_append_by_key.3
 
 memcached_delete.3: memcached_delete.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_delete.pod > memcached_delete.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_delete.pod > memcached_delete.3
 
 memcached_delete_by_key.3: memcached_delete.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_delete.pod > memcached_delete_by_key.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_delete.pod > memcached_delete_by_key.3
 
 memcached_increment.3:
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_auto.pod > memcached_increment.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_auto.pod > memcached_increment.3
 
 memcached_increment_with_initial.3:
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_auto.pod > memcached_increment_with_initial.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_auto.pod > memcached_increment_with_initial.3
 
 memcached_decrement.3:
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_auto.pod > memcached_decrement.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_auto.pod > memcached_decrement.3
 
 memcached_decrement_with_initial.3:
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_auto.pod > memcached_decrement_with_initial.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_auto.pod > memcached_decrement_with_initial.3
 
 memcached_flush.3: memcached_flush.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_flush.pod > memcached_flush.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_flush.pod > memcached_flush.3
 
 memcached_get.3: memcached_get.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_get.pod > memcached_get.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_get.3
 
 memcached_get_by_key.3: memcached_get.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_get.pod > memcached_get_by_key.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_get_by_key.3
 
 memcached_fetch_result.3: memcached_get.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_get.pod > memcached_fetch_result.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_fetch_result.3
 
 memcached_fetch_execute.3: memcached_get.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_get.pod > memcached_fetch_execute.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_fetch_execute.3
 
 memcached_mget.3: memcached_get.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_get.pod > memcached_mget.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_mget.3
 
 memcached_mget_by_key.3: memcached_get.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_get.pod > memcached_mget_by_key.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_mget_by_key.3
 
 memcached_fetch.3: memcached_get.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_get.pod > memcached_fetch.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_fetch.3
 
 memcached_quit.3: memcached_quit.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_quit.pod > memcached_quit.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_quit.pod > memcached_quit.3
 
 memcached_strerror.3: memcached_strerror.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_strerror.pod > memcached_strerror.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_strerror.pod > memcached_strerror.3
 
 memcached_server_count.3: memcached_servers.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_servers.pod > memcached_server_count.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_count.3
 
 memcached_server_list.3: memcached_servers.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_servers.pod > memcached_server_list.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_list.3
 
 memcached_server_add.3: memcached_servers.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_servers.pod > memcached_server_add.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_add.3
 
 memcached_server_add_unix_socket.3: memcached_servers.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_servers.pod > memcached_server_add_unix_socket.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_add_unix_socket.3
 
 memcached_server_push.3: memcached_servers.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_servers.pod > memcached_server_push.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_push.3
 
 memcached_server_list_free.3: memcached_server_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_server_st.pod > memcached_server_list_free.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_server_st.pod > memcached_server_list_free.3
 
 memcached_server_list_count.3: memcached_server_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_server_st.pod > memcached_server_list_count.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_server_st.pod > memcached_server_list_count.3
 
 memcached_server_list_append.3: memcached_server_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_server_st.pod > memcached_server_list_append.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_server_st.pod > memcached_server_list_append.3
 
 memcached_servers_parse.3: memcached_server_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_server_st.pod > memcached_servers_parse.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_server_st.pod > memcached_servers_parse.3
 
 memcached_verbosity.3: memcached_verbosity.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_verbosity.pod > memcached_verbosity.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_verbosity.pod > memcached_verbosity.3
 
 memcached_behavior_get.3: memcached_behavior.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_behavior.pod > memcached_behavior_get.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_behavior.pod > memcached_behavior_get.3
 
 memcached_behavior_set.3: memcached_behavior.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_behavior.pod > memcached_behavior_set.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_behavior.pod > memcached_behavior_set.3
 
 memcached_callback_get.3: memcached_callback.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_callback.pod > memcached_callback_get.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_callback.pod > memcached_callback_get.3
 
 memcached_callback_set.3: memcached_callback.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_callback.pod > memcached_callback_set.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_callback.pod > memcached_callback_set.3
 
 memcached_stat.3: memcached_stats.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_stats.pod > memcached_stat.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_stats.pod > memcached_stat.3
 
 memcached_stat_servername.3: memcached_stats.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_stats.pod > memcached_stat_servername.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_stats.pod > memcached_stat_servername.3
 
 memcached_stat_get_value.3: memcached_stats.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_stats.pod > memcached_stat_get_value.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_stats.pod > memcached_stat_get_value.3
 
 memcached_stat_get_keys.3: memcached_stats.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_stats.pod > memcached_stat_get_keys.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_stats.pod > memcached_stat_get_keys.3
 
 memcached_result_st.3: memcached_result_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_st.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_st.3
 
 memcached_result_create.3: memcached_result_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_create.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_create.3
 
 memcached_result_free.3: memcached_result_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_free.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_free.3
 
 memcached_result_key_value.3: memcached_result_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_key_value.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_key_value.3
 
 memcached_result_key_length.3: memcached_result_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_key_length.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_key_length.3
 
 memcached_result_value.3: memcached_result_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_value.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_value.3
 
 memcached_result_length.3: memcached_result_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_length.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_length.3
 
 memcached_result_flags.3: memcached_result_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_flags.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_flags.3
 
 memcached_result_cas.3: memcached_result_st.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_cas.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_cas.3
 
 memcached_version.3: memcached_version.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_version.pod > memcached_version.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_version.pod > memcached_version.3
 
 memcached_lib_version.3: memcached_version.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_version.pod  > memcached_lib_version.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_version.pod  > memcached_lib_version.3
 
 memcached_flush_buffers.3: memcached_flush_buffers.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_flush_buffers.pod  > memcached_flush_buffers.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_flush_buffers.pod  > memcached_flush_buffers.3
 
 memcached_analyze.3: memcached_analyze.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_analyze.pod > memcached_analyze.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_analyze.pod > memcached_analyze.3
 
 memcached_generate_hash_value.3: memcached_generate_hash_value.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 3 memcached_generate_hash_value.pod > memcached_generate_hash_value.3
+	@POD2MAN@ -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_generate_hash_value.pod > memcached_generate_hash_value.3
 
 memcached_pool_create.3: memcached_pool.pod 
-	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 memcached_pool.pod > memcached_pool_create.3
+	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_create.3
 
 memcached_pool_destroy.3: memcached_pool.pod 
-	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 memcached_pool.pod > memcached_pool_destroy.3
+	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_destroy.3
 
 memcached_pool_pop.3: memcached_pool.pod 
-	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 memcached_pool.pod > memcached_pool_pop.3
+	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_pop.3
 
 memcached_pool_push.3: memcached_pool.pod 
-	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 memcached_pool.pod > memcached_pool_push.3
+	@POD2MAN@ -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_push.3
 
 memcp.1: memcp.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 1 memcp.pod > memcp.1
+	@POD2MAN@ -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memcp.pod > memcp.1
 
 memslap.1: memslap.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 1 memslap.pod > memslap.1
+	@POD2MAN@ -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memslap.pod > memslap.1
 
 memcat.1: memcat.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 1 memcat.pod > memcat.1
+	@POD2MAN@ -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memcat.pod > memcat.1
 
 memstat.1: memstat.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 1 memstat.pod > memstat.1
+	@POD2MAN@ -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memstat.pod > memstat.1
 
 memrm.1: memrm.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 1 memrm.pod > memrm.1
+	@POD2MAN@ -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memrm.pod > memrm.1
 
 memerror.1: memerror.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 1 memerror.pod > memerror.1
+	@POD2MAN@ -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memerror.pod > memerror.1
 
 memflush.1: memflush.pod
-	@POD2MAN@ -c "libmemcached" -r "" -s 1 memflush.pod > memflush.1
+	@POD2MAN@ -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memflush.pod > memflush.1
 
 test: 
-	podchecker libmemcached.pod
-	podchecker memcached_flush.pod
-	podchecker memcached_stats.pod
-	podchecker memrm.pod
-	podchecker memerror.pod
-	podchecker libmemcached_examples.pod
-	podchecker memcached_get.pod
-	podchecker memcached_strerror.pod
-	podchecker memslap.pod
-	podchecker memcached_auto.pod
-	podchecker memcached_quit.pod
-	podchecker memcached_verbosity.pod
-	podchecker memstat.pod
-	podchecker memcached_behavior.pod
-	podchecker memcached_callback.pod
-	podchecker memcached_server_st.pod
-	podchecker memcat.pod
-	podchecker memcached_create.pod
-	podchecker memcached_servers.pod
-	podchecker memcp.pod
-	podchecker memcached_delete.pod
-	podchecker memcached_set.pod
-	podchecker memcached_version.pod
-	podchecker memflush.pod
-	podchecker memcached_flush_buffers.pod
-	podchecker memcached_pool.pod
-
-html:
+	podchecker $(top_srcdir)/docs/libmemcached.pod
+	podchecker $(top_srcdir)/docs/memcached_flush.pod
+	podchecker $(top_srcdir)/docs/memcached_stats.pod
+	podchecker $(top_srcdir)/docs/memrm.pod
+	podchecker $(top_srcdir)/docs/memerror.pod
+	podchecker $(top_srcdir)/docs/libmemcached_examples.pod
+	podchecker $(top_srcdir)/docs/memcached_get.pod
+	podchecker $(top_srcdir)/docs/memcached_strerror.pod
+	podchecker $(top_srcdir)/docs/memslap.pod
+	podchecker $(top_srcdir)/docs/memcached_auto.pod
+	podchecker $(top_srcdir)/docs/memcached_quit.pod
+	podchecker $(top_srcdir)/docs/memcached_verbosity.pod
+	podchecker $(top_srcdir)/docs/memstat.pod
+	podchecker $(top_srcdir)/docs/memcached_behavior.pod
+	podchecker $(top_srcdir)/docs/memcached_callback.pod
+	podchecker $(top_srcdir)/docs/memcached_server_st.pod
+	podchecker $(top_srcdir)/docs/memcat.pod
+	podchecker $(top_srcdir)/docs/memcached_create.pod
+	podchecker $(top_srcdir)/docs/memcached_servers.pod
+	podchecker $(top_srcdir)/docs/memcp.pod
+	podchecker $(top_srcdir)/docs/memcached_delete.pod
+	podchecker $(top_srcdir)/docs/memcached_set.pod
+	podchecker $(top_srcdir)/docs/memcached_version.pod
+	podchecker $(top_srcdir)/docs/memflush.pod
+	podchecker $(top_srcdir)/docs/memcached_flush_buffers.pod
+	podchecker $(top_srcdir)/docs/memcached_pool.pod
+
+html-local:
 	pod2htmltree "/libmemcached" .
 
-clean:
-	rm -f *.1
-	rm -f *.3
-
-distclean:
-	rm -f *.1
-	rm -f *.3
-	rm -f Makefile
diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 5763c06c..a7c0b294 100644
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,9 +1,7 @@
-EXTRA_DIST = libmemcached_probes.d memcached/README.txt
+EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver
 
 BUILT_SOURCES= @DTRACE_HEADER@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
 EXTRA_HEADERS = 
 DTRACE =                @DTRACE@
 DTRACEFLAGS =           @DTRACEFLAGS@
@@ -75,7 +73,7 @@ endif
 DEFS += -DMEMCACHED_INTERNAL
 libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@
 libmemcached_la_LIBADD = @DTRACE_OBJ@
-libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LIBM)
+libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LD_VERSION_SCRIPT) $(LIBM)
 
 dtrace_probes.h: libmemcached_probes.d
 	$(DTRACE) $(DTRACEFLAGS) -o dtrace_probes.tmp -h -s libmemcached_probes.d
diff --git a/libmemcached/common.h b/libmemcached/common.h
index c8a1c601..e5dffe5b 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -5,7 +5,7 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-#include "libmemcached_config.h"
+#include "libmemcached/libmemcached_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,10 +25,10 @@
 #include <netinet/tcp.h>
 
 
-#include <memcached.h>
-#include "memcached_io.h"
+#include "libmemcached/memcached.h"
+#include "libmemcached/memcached_io.h"
 
-#include "memcached/protocol_binary.h"
+#include "libmemcached/memcached/protocol_binary.h"
 
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
diff --git a/libmemcached/libmemcached.ver b/libmemcached/libmemcached.ver
new file mode 100644
index 00000000..8c5feb1a
--- /dev/null
+++ b/libmemcached/libmemcached.ver
@@ -0,0 +1 @@
+libmemcached_2 { global: *; };
diff --git a/libmemcached/memcached.hh b/libmemcached/memcached.hh
index 56879566..01b95f6b 100644
--- a/libmemcached/memcached.hh
+++ b/libmemcached/memcached.hh
@@ -1,8 +1,4 @@
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface                       /* gcc class implementation */
-#endif
-
-#include <memcached.h>
+#include "libmemcached/memcached.h"
 #include <string.h>
 #include <stdio.h>
 
diff --git a/libmemcached/memcached_io.h b/libmemcached/memcached_io.h
index 372357a9..6bcf871b 100644
--- a/libmemcached/memcached_io.h
+++ b/libmemcached/memcached_io.h
@@ -1,5 +1,5 @@
 /* Server IO, Not public! */
-#include <memcached.h>
+#include "libmemcached/memcached.h"
 
 #ifndef __MEMCACHED_IO_H__
 #define __MEMCACHED_IO_H__
diff --git a/libmemcached/memcached_parse.c b/libmemcached/memcached_parse.c
index b81ccda1..62896dea 100644
--- a/libmemcached/memcached_parse.c
+++ b/libmemcached/memcached_parse.c
@@ -5,7 +5,7 @@
   Frankly its too damn useful not to be here though.
 */
 
-#include <memcached.h>
+#include "libmemcached/memcached.h"
 #include "common.h"
 
 memcached_server_st *memcached_servers_parse(const char *server_strings)
diff --git a/libmemcachedutil/Makefile.am b/libmemcachedutil/Makefile.am
index 73e8f6de..852dc5dc 100644
--- a/libmemcachedutil/Makefile.am
+++ b/libmemcachedutil/Makefile.am
@@ -1,4 +1,3 @@
-INCLUDES = -I$(top_builddir)
 LIBS = @LIBS@
 
 lib_LTLIBRARIES=
diff --git a/libmemcachedutil/memcached_pool.c b/libmemcachedutil/memcached_pool.c
index 83326b61..7a4aa073 100644
--- a/libmemcachedutil/memcached_pool.c
+++ b/libmemcachedutil/memcached_pool.c
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "libmemcached/common.h"
 #include "libmemcached/memcached_pool.h"
 #include <pthread.h>
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 133ec6d0..cb0bc2a0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,3 @@
-INCLUDES = -I$(top_builddir)
 LDADDS = $(top_builddir)/libmemcached/libmemcached.la
 
 if BUILD_LIBMEMCACHEDUTIL
diff --git a/tests/plus.cpp b/tests/plus.cpp
index 7bb2a293..4a3789b9 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -1,8 +1,9 @@
 /*
   C++ interface test
 */
+#include "libmemcached/memcached.hh"
+
 #include <assert.h>
-#include <memcached.hh>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/server.c b/tests/server.c
index 2528787c..8679c624 100644
--- a/tests/server.c
+++ b/tests/server.c
@@ -106,7 +106,9 @@ void server_shutdown(server_startup_st *construct)
     {
       char buffer[1024]; /* Nothing special for number */
       sprintf(buffer, "cat /tmp/%umemc.pid | xargs kill", x);
-      system(buffer);
+      /* We have to check the return value of this or the compiler will yell */
+      int sys_ret= system(buffer);
+      assert(sys_ret != -1); 
       sprintf(buffer, "/tmp/%umemc.pid", x);
       unlink(buffer);
     }