Updates, rpm now tests the install locations.

diff --git a/Makefile.am b/Makefile.am
index 476845c0d24b086807ceb9acebb8a3ae4291e8cc..d163202714941cb07d46fe389fe06246813091d4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,8 @@ noinst_HEADERS =
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
-pkginclude_HEADERS =
-nobase_pkginclude_HEADERS =
+include_HEADERS =
+nobase_include_HEADERS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST = README.FIRST

diff --git a/configure.ac b/configure.ac
index 598b930e8db98e5d19bcab4c2b61c9cea502c64a..5a8f17081b0ea651005589f2b61f07204ee1b562 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],
 AC_CONFIG_FILES([
   Makefile
   docs/Makefile
-  libmemcached/memcached_configure.h
+  libmemcached/configure.h
   support/libmemcached.pc
   support/libmemcached.spec
   support/libmemcached-fc.spec

diff --git a/libhashkit/include.am b/libhashkit/include.am
index 43f8ee164a617644a74501308784bde5e06c7312..dd941f9672533f0894fad3885ae4ba92f15f8a8a 100644 (file)
--- a/libhashkit/include.am
+++ b/libhashkit/include.am
@@ -11,7 +11,7 @@
 
 lib_LTLIBRARIES+= libhashkit/libhashkit.la
 
-nobase_pkginclude_HEADERS+= \
+nobase_include_HEADERS+= \
                            libhashkit/algorithm.h \
                            libhashkit/behavior.h \
                            libhashkit/hashkit.h \

diff --git a/libmemcached/configure.h.in b/libmemcached/configure.h.in
new file mode 100644 (file)
index 0000000..c4301df
--- /dev/null
+++ b/libmemcached/configure.h.in
@@ -0,0 +1,28 @@
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker, Trond Norbye
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: Change the behavior of the memcached connection.
+ *
+ */
+
+#ifndef MEMCACHED_CONFIGURE_H
+#define MEMCACHED_CONFIGURE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+@DEPRECATED@
+
+#define LIBMEMCACHED_VERSION_STRING "@VERSION@"
+#define LIBMEMCACHED_VERSION_HEX @PANDORA_HEX_VERSION@
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MEMCACHED_CONFIGURE_H */

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 29a77538fc8421bca888ef86e1b8649e4fe7ee04..8adde9f033fefcd6ddfd1edf6ccfe566e4ea9699 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -3,10 +3,9 @@
 # All paths should be given relative to the root
 
 EXTRA_DIST+= \
+            libmemcached/configure.h.in \
             libmemcached/libmemcached_probes.d \
-            libmemcached/memcached/README.txt \
-            libmemcached/memcached_configure.h.in
-
+            libmemcached/memcached/README.txt
 
 noinst_HEADERS+= \
                 libmemcached/byteorder.h \
@@ -19,31 +18,29 @@ noinst_HEADERS+= \
                 libmemcached/protocol/ascii_handler.h \
                 libmemcached/protocol/binary_handler.h
 
-nobase_pkginclude_HEADERS+= \
-                           libmemcached/analyze.h \
-                           libmemcached/auto.h \
-                           libmemcached/behavior.h \
-                           libmemcached/callback.h \
-                           libmemcached/constants.h \
-                           libmemcached/dump.h \
-                           libmemcached/exception.hpp \
-                           libmemcached/get.h \
-                           libmemcached/memcached.h \
-                           libmemcached/memcached.hpp \
-                           libmemcached/memcached_configure.h \
-                           libmemcached/protocol/cache.h \
-                           libmemcached/protocol/callback.h \
-                           libmemcached/protocol_handler.h \
-                           libmemcached/result.h \
-                           libmemcached/server.h \
-                           libmemcached/stats.h \
-                           libmemcached/storage.h \
-                           libmemcached/string.h \
-                           libmemcached/types.h \
-                           libmemcached/visibility.h \
-                           libmemcached/watchpoint.h
-
-
+nobase_include_HEADERS+= \
+                        libmemcached/analyze.h \
+                        libmemcached/auto.h \
+                        libmemcached/behavior.h \
+                        libmemcached/callback.h \
+                        libmemcached/configure.h \
+                        libmemcached/constants.h \
+                        libmemcached/dump.h \
+                        libmemcached/exception.hpp \
+                        libmemcached/get.h \
+                        libmemcached/memcached.h \
+                        libmemcached/memcached.hpp \
+                        libmemcached/protocol/cache.h \
+                        libmemcached/protocol/callback.h \
+                        libmemcached/protocol_handler.h \
+                        libmemcached/result.h \
+                        libmemcached/server.h \
+                        libmemcached/stats.h \
+                        libmemcached/storage.h \
+                        libmemcached/string.h \
+                        libmemcached/types.h \
+                        libmemcached/visibility.h \
+                        libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la
 libmemcached_libmemcachedprotocol_la_SOURCES =  \
@@ -114,7 +111,9 @@ libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.
 libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
 
 if BUILD_LIBMEMCACHEDUTIL
-pkginclude_HEADERS+= libmemcached/memcached_util.h libmemcached/util/pool.h
+nobase_include_HEADERS+= \
+                        libmemcached/memcached_util.h \
+                        libmemcached/util/pool.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif
 

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 95592a487490d85a7531123adb716a48a016c98c..4ea5ded211f0850c8099560c97fc384fd434bdd9 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -24,7 +24,7 @@
 #include <netinet/in.h>
 
 #include <libmemcached/visibility.h>
-#include <libmemcached/memcached_configure.h>
+#include <libmemcached/configure.h>
 #include <libmemcached/constants.h>
 #include <libmemcached/types.h>
 #include <libmemcached/string.h>

diff --git a/libmemcached/memcached_configure.h.in b/libmemcached/memcached_configure.h.in
deleted file mode 100644 (file)
index 5d4e60e..0000000
--- a/libmemcached/memcached_configure.h.in
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Summary: Preprocessor symbols set from configure we need install-time
- *
- * Copy: See Copyright for the status of this software.
- *
- * Author: Trond Norbye
- */
-
-#ifndef MEMCACHED_CONFIGURE_H
-#define MEMCACHED_CONFIGURE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-@DEPRECATED@
-
-#define LIBMEMCACHED_VERSION_STRING "@VERSION@"
-#define LIBMEMCACHED_VERSION_HEX @PANDORA_HEX_VERSION@
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MEMCACHED_CONFIGURE_H */

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index 998a2f2ff288d50603876e7dade0acd6c62938f8..53c4715c2dd6dff7fbddf681bd3f1592ea5dfadc 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -92,42 +92,51 @@ you will need to install %{name}-devel.
 %files devel
 %defattr (-,root,root,-) 
 %doc examples
-%{_includedir}/libmemcached/memcached_pool.h
-%{_includedir}/libmemcached/memcached_watchpoint.h
-%{_includedir}/libmemcached/memcached_get.h
-%{_includedir}/libmemcached/memcached_configure.h
-%{_includedir}/libmemcached/memcached_types.h
-%{_includedir}/libmemcached/memcached_constants.h
-%{_includedir}/libmemcached/protocol
-%{_includedir}/libmemcached/protocol/cache.h
-%{_includedir}/libmemcached/protocol/callback.h
-%{_includedir}/libmemcached/memcached_result.h
-%{_includedir}/libmemcached/memcached_server.h
-%{_includedir}/libmemcached/memcached_storage.h
-%{_includedir}/libmemcached/memcached_string.h
-%{_includedir}/libmemcached/memcached_util.h
-%{_includedir}/libmemcached/exception.hpp
-%{_includedir}/libmemcached/memcached.h
-%{_includedir}/libmemcached/protocol_handler.h
-%{_includedir}/libmemcached/memcached.hpp
-%{_includedir}/libmemcached/visibility.h
 %{_includedir}/libhashkit/algorithm.h
 %{_includedir}/libhashkit/behavior.h
 %{_includedir}/libhashkit/hashkit.h
 %{_includedir}/libhashkit/strerror.h
 %{_includedir}/libhashkit/types.h
 %{_includedir}/libhashkit/visibility.h
+%{_includedir}/libmemcached/analyze.h
+%{_includedir}/libmemcached/auto.h
+%{_includedir}/libmemcached/behavior.h
+%{_includedir}/libmemcached/callback.h
+%{_includedir}/libmemcached/configure.h
+%{_includedir}/libmemcached/constants.h
+%{_includedir}/libmemcached/dump.h
+%{_includedir}/libmemcached/exception.hpp
+%{_includedir}/libmemcached/get.h
+%{_includedir}/libmemcached/memcached.h
+%{_includedir}/libmemcached/memcached.hpp
+%{_includedir}/libmemcached/memcached_util.h
+%{_includedir}/libmemcached/protocol
+%{_includedir}/libmemcached/protocol/cache.h
+%{_includedir}/libmemcached/protocol/callback.h
+%{_includedir}/libmemcached/protocol_handler.h
+%{_includedir}/libmemcached/result.h
+%{_includedir}/libmemcached/server.h
+%{_includedir}/libmemcached/stats.h
+%{_includedir}/libmemcached/storage.h
+%{_includedir}/libmemcached/string.h
+%{_includedir}/libmemcached/types.h
+%{_includedir}/libmemcached/util/pool.h
+%{_includedir}/libmemcached/visibility.h
+%{_includedir}/libmemcached/watchpoint.h
 %{_libdir}/libhashkit.so
 %{_libdir}/libmemcached.so
-%{_libdir}/libmemcachedutil.so
 %{_libdir}/libmemcachedprotocol.so
+%{_libdir}/libmemcachedutil.so
 %{_libdir}/pkgconfig/libmemcached.pc
+%{_mandir}/man3/hashkit*.3.gz
 %{_mandir}/man3/libmemcached*.3.gz
 %{_mandir}/man3/memcached_*.3.gz
-%{_mandir}/man3/hashkit*.3.gz
 
 
 %changelog
+* Fri Jan  8 2010
+- Modified to be explicit in install include files. 
+
 * Sat Apr 25 2009 Remi Collet <rpms@famillecollet.com> - 0.28-1
 - Initial RPM from Brian Aker spec
 - create -devel subpackage