Fix configure --enable-cplusplus make install

(Apply commit b71d819)

* Makefile.am (pkginclude_HEADERS): Remove gc_allocator.h
entry.
* Makefile.am (include_HEADERS): Add include/extra/gc_cpp.h entry
(only if CPLUSPLUS).
* include/include.am (pkginclude_HEADERS): Remove include/gc_cpp.h
entry.
* include/include.am (include_HEADERS): Remove include/extra/gc_cpp.h
entry.

diff --git a/Makefile.am b/Makefile.am
index 30106f9a20b9cc7135c6748dbbd8fca377ea38a5..3275750b09774f05aae7786b90d979c64e57e1cb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,7 +102,8 @@ EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
 
 if CPLUSPLUS
 lib_LTLIBRARIES += libgccpp.la
-pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h
+pkginclude_HEADERS += include/gc_cpp.h
+include_HEADERS += include/extra/gc_cpp.h
 libgccpp_la_SOURCES = gc_cpp.cc
 libgccpp_la_LIBADD = ./libgc.la
 libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined

diff --git a/include/include.am b/include/include.am
index 399e5420e8b3c78ef4bf5a0d6407cf79278cb619..c72bc86fede027acea3351e3183d44c146604114 100644 (file)
--- a/include/include.am
+++ b/include/include.am
@@ -21,7 +21,6 @@ pkginclude_HEADERS += \
        include/gc_typed.h \
        include/gc_inline.h \
        include/gc_mark.h \
-       include/gc_cpp.h \
        include/weakpointer.h \
        include/new_gc_alloc.h \
        include/gc_allocator.h \
@@ -56,5 +55,4 @@ dist_noinst_HEADERS += \
 
 # unprefixed header
 include_HEADERS += \
-        include/extra/gc.h \
-        include/extra/gc_cpp.h
+        include/extra/gc.h