File google-perftools_fix_multiple_install_headers.patch of Package google-perftools

Index: google-perftools-1.3/Makefile.am
===================================================================
--- google-perftools-1.3.orig/Makefile.am
+++ google-perftools-1.3/Makefile.am
@@ -216,8 +216,6 @@ TESTS += low_level_alloc_unittest
 WINDOWS_PROJECTS += vsprojects/low_level_alloc_unittest/low_level_alloc_unittest.vcproj
 LOW_LEVEL_ALLOC_UNITTEST_INCLUDES = src/base/low_level_alloc.h \
                                     src/base/basictypes.h \
-                                    src/google/malloc_hook.h \
-                                    src/google/malloc_hook_c.h \
                                     src/malloc_hook-inl.h \
                                     $(SPINLOCK_INCLUDES) \
                                     $(LOGGING_INCLUDES)
@@ -339,10 +337,9 @@ S_TCMALLOC_MINIMAL_INCLUDES = src/common
 SG_TCMALLOC_MINIMAL_INCLUDES = src/google/malloc_hook.h \
                                src/google/malloc_hook_c.h \
                                src/google/malloc_extension.h \
-                               src/google/malloc_extension_c.h \
-                               src/google/stacktrace.h
+                               src/google/malloc_extension_c.h
 TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES)
-googleinclude_HEADERS += $(SG_TCMALLOC_MINIMAL_INCLUDES)
+# googleinclude_HEADERS += $(SG_TCMALLOC_MINIMAL_INCLUDES)
 
 ### Making the library
 
@@ -496,9 +493,7 @@ TESTS += malloc_extension_test
 WINDOWS_PROJECTS += vsprojects/malloc_extension_test/malloc_extension_test.vcproj
 malloc_extension_test_SOURCES = src/tests/malloc_extension_test.cc \
                                 src/config_for_unittests.h \
-                                src/base/logging.h \
-                                src/google/malloc_extension.h \
-                                src/google/malloc_extension_c.h
+                                src/base/logging.h
 malloc_extension_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 malloc_extension_test_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 malloc_extension_test_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
@@ -677,8 +672,7 @@ LIBS_TO_WEAKEN += libtcmalloc.la
 ### Unittests
 
 TESTS += tcmalloc_unittest
-TCMALLOC_UNITTEST_INCLUDES = src/config_for_unittests.h \
-                             src/google/malloc_extension.h
+TCMALLOC_UNITTEST_INCLUDES = src/config_for_unittests.h
 tcmalloc_unittest_SOURCES = src/tests/tcmalloc_unittest.cc \
                             src/tcmalloc.h \
                             src/tests/testutil.h src/tests/testutil.cc \
@@ -743,8 +737,7 @@ sampling_test.sh$(EXEEXT): $(top_srcdir)
 # The -g is so pprof can get symbol information.
 noinst_PROGRAMS += sampling_test
 SAMPLING_TEST_INCLUDES = src/config_for_unittests.h \
-                         src/base/logging.h \
-                         src/google/malloc_extension.h
+                         src/base/logging.h
 sampling_test_SOURCES = src/tests/sampling_test.cc \
                         $(SAMPLING_TEST_INCLUDES)
 sampling_test_CXXFLAGS = -g $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
@@ -836,8 +829,7 @@ S_CPU_PROFILER_INCLUDES = src/profiledat
                           src/base/sysinfo.h \
                           $(SPINLOCK_INCLUDES) \
                           $(LOGGING_INCLUDES)
-SG_CPU_PROFILER_INCLUDES = src/google/profiler.h \
-                           src/google/stacktrace.h
+SG_CPU_PROFILER_INCLUDES = src/google/profiler.h
 CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES)
 googleinclude_HEADERS += $(SG_CPU_PROFILER_INCLUDES)