Add the --with-install-suffix configure option.

Fix some bugs in the Makefile's install target.

28 files changed, 83 insertions, 55 deletions

diff --git a/jemalloc/src/jemalloc_arena.h b/jemalloc/src/internal/jemalloc_arena.h
index 61fec68..61fec68 100644
--- a/jemalloc/src/jemalloc_arena.h
+++ b/jemalloc/src/internal/jemalloc_arena.h
diff --git a/jemalloc/src/jemalloc_base.h b/jemalloc/src/internal/jemalloc_base.h
index ef650dd..ef650dd 100644
--- a/jemalloc/src/jemalloc_base.h
+++ b/jemalloc/src/internal/jemalloc_base.h
diff --git a/jemalloc/src/jemalloc_chunk.h b/jemalloc/src/internal/jemalloc_chunk.h
index b2e24ff..b2e24ff 100644
--- a/jemalloc/src/jemalloc_chunk.h
+++ b/jemalloc/src/internal/jemalloc_chunk.h
diff --git a/jemalloc/src/jemalloc_extent.h b/jemalloc/src/internal/jemalloc_extent.h
index 0ce27c7..0ce27c7 100644
--- a/jemalloc/src/jemalloc_extent.h
+++ b/jemalloc/src/internal/jemalloc_extent.h
diff --git a/jemalloc/src/jemalloc_huge.h b/jemalloc/src/internal/jemalloc_huge.h
index 71dc1fc..71dc1fc 100644
--- a/jemalloc/src/jemalloc_huge.h
+++ b/jemalloc/src/internal/jemalloc_huge.h
diff --git a/jemalloc/src/jemalloc_internal.h b/jemalloc/src/internal/jemalloc_internal.h.in
index 5be40da..139c0e7 100644
--- a/jemalloc/src/jemalloc_internal.h
+++ b/jemalloc/src/internal/jemalloc_internal.h.in
@@ -24,16 +24,16 @@
 #include <pthread.h>
 
 #define	JEMALLOC_MANGLE
-#include "jemalloc.h"
+#include "../jemalloc@install_suffix@.h"
 
 #ifdef JEMALLOC_LAZY_LOCK
 #include <dlfcn.h>
 #endif
 
-#include "rb.h"
+#include "internal/rb.h"
 #if (defined(JEMALLOC_TCACHE) && defined(JEMALLOC_STATS))
-#include "qr.h"
-#include "ql.h"
+#include "internal/qr.h"
+#include "internal/ql.h"
 #endif
 
 extern void	(*JEMALLOC_P(malloc_message))(const char *p1, const char *p2,
@@ -168,29 +168,29 @@ extern void	(*JEMALLOC_P(malloc_message))(const char *p1, const char *p2,
 #define	PAGE_CEILING(s)							\
 	(((s) + PAGE_MASK) & ~PAGE_MASK)
 
-#include "jemalloc_stats.h"
-#include "jemalloc_mutex.h"
-#include "jemalloc_extent.h"
-#include "jemalloc_arena.h"
-#include "jemalloc_base.h"
-#include "jemalloc_chunk.h"
-#include "jemalloc_huge.h"
-#include "jemalloc_tcache.h"
-#include "jemalloc_trace.h"
+#include "internal/jemalloc_stats.h"
+#include "internal/jemalloc_mutex.h"
+#include "internal/jemalloc_extent.h"
+#include "internal/jemalloc_arena.h"
+#include "internal/jemalloc_base.h"
+#include "internal/jemalloc_chunk.h"
+#include "internal/jemalloc_huge.h"
+#include "internal/jemalloc_tcache.h"
+#include "internal/jemalloc_trace.h"
 
 #undef JEMALLOC_H_TYPES
 /******************************************************************************/
 #define JEMALLOC_H_STRUCTS
 
-#include "jemalloc_stats.h"
-#include "jemalloc_mutex.h"
-#include "jemalloc_extent.h"
-#include "jemalloc_arena.h"
-#include "jemalloc_base.h"
-#include "jemalloc_chunk.h"
-#include "jemalloc_huge.h"
-#include "jemalloc_tcache.h"
-#include "jemalloc_trace.h"
+#include "internal/jemalloc_stats.h"
+#include "internal/jemalloc_mutex.h"
+#include "internal/jemalloc_extent.h"
+#include "internal/jemalloc_arena.h"
+#include "internal/jemalloc_base.h"
+#include "internal/jemalloc_chunk.h"
+#include "internal/jemalloc_huge.h"
+#include "internal/jemalloc_tcache.h"
+#include "internal/jemalloc_trace.h"
 
 #undef JEMALLOC_H_STRUCTS
 /******************************************************************************/
@@ -238,26 +238,26 @@ arena_t	*arenas_extend(unsigned ind);
 arena_t	*choose_arena_hard(void);
 #endif
 
-#include "jemalloc_stats.h"
-#include "jemalloc_mutex.h"
-#include "jemalloc_extent.h"
-#include "jemalloc_arena.h"
-#include "jemalloc_base.h"
-#include "jemalloc_chunk.h"
-#include "jemalloc_huge.h"
-#include "jemalloc_tcache.h"
-#include "jemalloc_trace.h"
+#include "internal/jemalloc_stats.h"
+#include "internal/jemalloc_mutex.h"
+#include "internal/jemalloc_extent.h"
+#include "internal/jemalloc_arena.h"
+#include "internal/jemalloc_base.h"
+#include "internal/jemalloc_chunk.h"
+#include "internal/jemalloc_huge.h"
+#include "internal/jemalloc_tcache.h"
+#include "internal/jemalloc_trace.h"
 
 #undef JEMALLOC_H_EXTERNS
 /******************************************************************************/
 #define JEMALLOC_H_INLINES
 
-#include "jemalloc_stats.h"
-#include "jemalloc_mutex.h"
-#include "jemalloc_extent.h"
-#include "jemalloc_base.h"
-#include "jemalloc_chunk.h"
-#include "jemalloc_huge.h"
+#include "internal/jemalloc_stats.h"
+#include "internal/jemalloc_mutex.h"
+#include "internal/jemalloc_extent.h"
+#include "internal/jemalloc_base.h"
+#include "internal/jemalloc_chunk.h"
+#include "internal/jemalloc_huge.h"
 
 #ifndef JEMALLOC_ENABLE_INLINE
 void	malloc_write4(const char *p1, const char *p2, const char *p3,
@@ -346,9 +346,9 @@ choose_arena(void)
 }
 #endif
 
-#include "jemalloc_tcache.h"
-#include "jemalloc_arena.h"
-#include "jemalloc_trace.h"
+#include "internal/jemalloc_tcache.h"
+#include "internal/jemalloc_arena.h"
+#include "internal/jemalloc_trace.h"
 
 #ifndef JEMALLOC_ENABLE_INLINE
 void	*imalloc(size_t size);
diff --git a/jemalloc/src/jemalloc_mutex.h b/jemalloc/src/internal/jemalloc_mutex.h
index 6761282..6761282 100644
--- a/jemalloc/src/jemalloc_mutex.h
+++ b/jemalloc/src/internal/jemalloc_mutex.h
diff --git a/jemalloc/src/jemalloc_stats.h b/jemalloc/src/internal/jemalloc_stats.h
index f15d657..f15d657 100644
--- a/jemalloc/src/jemalloc_stats.h
+++ b/jemalloc/src/internal/jemalloc_stats.h
diff --git a/jemalloc/src/jemalloc_tcache.h b/jemalloc/src/internal/jemalloc_tcache.h
index 4ec1fd5..4ec1fd5 100644
--- a/jemalloc/src/jemalloc_tcache.h
+++ b/jemalloc/src/internal/jemalloc_tcache.h
diff --git a/jemalloc/src/jemalloc_trace.h b/jemalloc/src/internal/jemalloc_trace.h
index 624d08c..624d08c 100644
--- a/jemalloc/src/jemalloc_trace.h
+++ b/jemalloc/src/internal/jemalloc_trace.h
diff --git a/jemalloc/src/internal/mtrgraph_defs.h.in b/jemalloc/src/internal/mtrgraph_defs.h.in
new file mode 100644
index 0000000..7a81e3c
--- /dev/null
+++ b/jemalloc/src/internal/mtrgraph_defs.h.in
@@ -0,0 +1,14 @@
+#ifndef MTRGRAPH_DEFS_H_
+#define	MTRGRAPH_DEFS_H_
+
+/* Defined if __attribute__((...)) syntax is supported. */
+#undef JEMALLOC_HAVE_ATTR
+#ifdef JEMALLOC_HAVE_ATTR
+#  define JEMALLOC_ATTR(s) __attribute__((s))
+#else
+#  define JEMALLOC_ATTR(s)
+#endif
+
+#undef JEMALLOC_DEBUG
+
+#endif /* MTRGRAPH_DEFS_H_ */
diff --git a/jemalloc/src/internal/mtrplay_defs.h.in b/jemalloc/src/internal/mtrplay_defs.h.in
new file mode 100644
index 0000000..8b62625
--- /dev/null
+++ b/jemalloc/src/internal/mtrplay_defs.h.in
@@ -0,0 +1,14 @@
+#ifndef MTRPLAY_DEFS_H_
+#define	MTRPLAY_DEFS_H_
+
+/* Defined if __attribute__((...)) syntax is supported. */
+#undef JEMALLOC_HAVE_ATTR
+#ifdef JEMALLOC_HAVE_ATTR
+#  define JEMALLOC_ATTR(s) __attribute__((s))
+#else
+#  define JEMALLOC_ATTR(s)
+#endif
+
+#undef JEMALLOC_DEBUG
+
+#endif /* MTRPLAY_DEFS_H_ */
diff --git a/jemalloc/src/ql.h b/jemalloc/src/internal/ql.h
index a9ed239..a9ed239 100644
--- a/jemalloc/src/ql.h
+++ b/jemalloc/src/internal/ql.h
diff --git a/jemalloc/src/qr.h b/jemalloc/src/internal/qr.h
index fe22352..fe22352 100644
--- a/jemalloc/src/qr.h
+++ b/jemalloc/src/internal/qr.h
diff --git a/jemalloc/src/rb.h b/jemalloc/src/internal/rb.h
index 21d06ea..21d06ea 100644
--- a/jemalloc/src/rb.h
+++ b/jemalloc/src/internal/rb.h
diff --git a/jemalloc/src/jemalloc.c b/jemalloc/src/jemalloc.c
index 8a0d97a..7a9f906 100644
--- a/jemalloc/src/jemalloc.c
+++ b/jemalloc/src/jemalloc.c
@@ -90,7 +90,7 @@
  */
 
 #define	JEMALLOC_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/jemalloc/src/jemalloc.h b/jemalloc/src/jemalloc.h.in
index 71c46b6..f2a89f5 100644
--- a/jemalloc/src/jemalloc.h
+++ b/jemalloc/src/jemalloc.h.in
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include "jemalloc_defs.h"
+#include "jemalloc_defs@install_suffix@.h"
 #ifndef JEMALLOC_P
 #  define JEMALLOC_P(s) s
 #endif
diff --git a/jemalloc/src/jemalloc_arena.c b/jemalloc/src/jemalloc_arena.c
index 5c8ea23..0f031c1 100644
--- a/jemalloc/src/jemalloc_arena.c
+++ b/jemalloc/src/jemalloc_arena.c
@@ -1,5 +1,5 @@
 #define	JEMALLOC_ARENA_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/jemalloc/src/jemalloc_base.c b/jemalloc/src/jemalloc_base.c
index 83499f6..af83cec 100644
--- a/jemalloc/src/jemalloc_base.c
+++ b/jemalloc/src/jemalloc_base.c
@@ -1,5 +1,5 @@
 #define	JEMALLOC_BASE_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 
 #ifdef JEMALLOC_STATS
 size_t	base_mapped;
diff --git a/jemalloc/src/jemalloc_chunk.c b/jemalloc/src/jemalloc_chunk.c
index caa941a..9cd0c21 100644
--- a/jemalloc/src/jemalloc_chunk.c
+++ b/jemalloc/src/jemalloc_chunk.c
@@ -1,5 +1,5 @@
 #define	JEMALLOC_CHUNK_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/jemalloc/src/jemalloc_extent.c b/jemalloc/src/jemalloc_extent.c
index 8f287f7..cbe7c4b 100644
--- a/jemalloc/src/jemalloc_extent.c
+++ b/jemalloc/src/jemalloc_extent.c
@@ -1,5 +1,5 @@
 #define	JEMALLOC_EXTENT_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 
 /******************************************************************************/
 
diff --git a/jemalloc/src/jemalloc_huge.c b/jemalloc/src/jemalloc_huge.c
index 6d71f65..b325927 100644
--- a/jemalloc/src/jemalloc_huge.c
+++ b/jemalloc/src/jemalloc_huge.c
@@ -1,5 +1,5 @@
 #define	JEMALLOC_HUGE_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/jemalloc/src/jemalloc_mutex.c b/jemalloc/src/jemalloc_mutex.c
index 26292e5..5e3cab3 100644
--- a/jemalloc/src/jemalloc_mutex.c
+++ b/jemalloc/src/jemalloc_mutex.c
@@ -1,5 +1,5 @@
 #define	JEMALLOC_MUTEX_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/jemalloc/src/jemalloc_stats.c b/jemalloc/src/jemalloc_stats.c
index 2db7740..e39bcfe 100644
--- a/jemalloc/src/jemalloc_stats.c
+++ b/jemalloc/src/jemalloc_stats.c
@@ -1,5 +1,5 @@
 #define	JEMALLOC_STATS_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/jemalloc/src/jemalloc_tcache.c b/jemalloc/src/jemalloc_tcache.c
index 1257703..fe572eb 100644
--- a/jemalloc/src/jemalloc_tcache.c
+++ b/jemalloc/src/jemalloc_tcache.c
@@ -1,5 +1,5 @@
 #define	JEMALLOC_TCACHE_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 #ifdef JEMALLOC_TCACHE
 /******************************************************************************/
 /* Data. */
diff --git a/jemalloc/src/jemalloc_trace.c b/jemalloc/src/jemalloc_trace.c
index 8163019..657a096 100644
--- a/jemalloc/src/jemalloc_trace.c
+++ b/jemalloc/src/jemalloc_trace.c
@@ -1,5 +1,5 @@
 #define	JEMALLOC_TRACE_C_
-#include "jemalloc_internal.h"
+#include "internal/jemalloc_internal.h"
 #ifdef JEMALLOC_TRACE
 /******************************************************************************/
 /* Data. */
diff --git a/jemalloc/src/mtrgraph.c b/jemalloc/src/mtrgraph.c
index cc17be2..c5f9dd3 100644
--- a/jemalloc/src/mtrgraph.c
+++ b/jemalloc/src/mtrgraph.c
@@ -15,12 +15,12 @@
 #include <gdfontl.h>
 #include <gdfontg.h>
 
-#include "jemalloc.h"
+#include "internal/mtrgraph_defs.h"
 #ifndef JEMALLOC_DEBUG
 #  define NDEBUG
 #endif
 #include <assert.h>
-#include "rb.h"
+#include "internal/rb.h"
 
 typedef struct
 {
diff --git a/jemalloc/src/mtrplay.c b/jemalloc/src/mtrplay.c
index 776ca26..134930f 100644
--- a/jemalloc/src/mtrplay.c
+++ b/jemalloc/src/mtrplay.c
@@ -16,12 +16,12 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 
-#include "jemalloc_defs.h"
+#include "internal/mtrplay_defs.h"
 #ifndef JEMALLOC_DEBUG
 #  define NDEBUG
 #endif
 #include <assert.h>
-#include "rb.h"
+#include "internal/rb.h"
 
 typedef struct record_s record_t;
 struct record_s {