From: Brian Aker Date: Thu, 7 Apr 2011 23:03:34 +0000 (-0700) Subject: Merge in fixes for rpm. X-Git-Tag: 0.51~15^2~23 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ab52d113db2890acee62d7522d7d709d5407bdab;p=m6w6%2Flibmemcached Merge in fixes for rpm. --- diff --git a/docs/conf.py b/docs/conf.py index c13fee63..6a483c16 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -270,7 +270,8 @@ man_pages = [ ('memcached_pool', 'memcached_pool_create', u'libmemcached Documentation', [u'Brian Aker'], 3), ('memcached_pool', 'memcached_pool_destroy', u'libmemcached Documentation', [u'Brian Aker'], 3), ('memcached_pool', 'memcached_pool_push', u'libmemcached Documentation', [u'Brian Aker'], 3), - ('memcached_pool', 'memcached_pool_rst', u'libmemcached Documentation', [u'Brian Aker'], 3), + ('memcached_pool', 'memcached_pool_pop', u'libmemcached Documentation', [u'Brian Aker'], 3), + ('memcached_pool', 'memcached_pool_push', u'libmemcached Documentation', [u'Brian Aker'], 3), ('memcached_quit', 'memcached_quit', u'libmemcached Documentation', [u'Brian Aker'], 3), ('memcached_result_st', 'memcached_result_cas', u'libmemcached Documentation', [u'Brian Aker'], 3), ('memcached_result_st', 'memcached_result_create', u'libmemcached Documentation', [u'Brian Aker'], 3), diff --git a/docs/include.am b/docs/include.am index b2fd8e91..0e93ee7d 100644 --- a/docs/include.am +++ b/docs/include.am @@ -167,6 +167,7 @@ if HAVE_RECENT_SPHINX man_MANS+= \ docs/man/hashkit_crc32.3 \ + docs/man/hashkit_clone.3 \ docs/man/hashkit_create.3 \ docs/man/hashkit_fnv1_32.3 \ docs/man/hashkit_fnv1_64.3 \ diff --git a/libmemcached/include.am b/libmemcached/include.am index 035725a3..b10f05af 100644 --- a/libmemcached/include.am +++ b/libmemcached/include.am @@ -15,6 +15,7 @@ noinst_HEADERS+= \ libmemcached/byteorder.h \ libmemcached/common.h \ libmemcached/do.h \ + libmemcached/initialize_query.h \ libmemcached/internal.h \ libmemcached/io.h \ libmemcached/is.h \ @@ -43,7 +44,6 @@ nobase_include_HEADERS+= \ libmemcached/flush_buffers.h \ libmemcached/get.h \ libmemcached/hash.h \ - libmemcached/initialize_query.h \ libmemcached/memcached.h \ libmemcached/memcached.hpp \ libmemcached/memcached/protocol_binary.h \