fix _HEADERS targets to not clobber each others

diff --git a/include/FLAC++/Makefile.am b/include/FLAC++/Makefile.am
index 9830b2b..d787b87 100644 (file)
--- a/include/FLAC++/Makefile.am
+++ b/include/FLAC++/Makefile.am
@@ -16,9 +16,9 @@
 #  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #  Boston, MA  02111-1307, USA.
 
-includedir = ${prefix}/include/FLAC++
+flaccppincludedir = $(includedir)/FLAC++
 
-include_HEADERS = \
+flaccppinclude_HEADERS = \
        all.h \
        decoder.h \
        encoder.h \

diff --git a/include/FLAC/Makefile.am b/include/FLAC/Makefile.am
index 2d0e083..4c4a276 100644 (file)
--- a/include/FLAC/Makefile.am
+++ b/include/FLAC/Makefile.am
@@ -16,9 +16,9 @@
 #  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #  Boston, MA  02111-1307, USA.
 
-includedir = ${prefix}/include/FLAC
+flaccincludedir = $(includedir)/FLAC
 
-include_HEADERS = \
+flaccinclude_HEADERS = \
        all.h \
        assert.h \
        file_decoder.h \

diff --git a/include/OggFLAC++/Makefile.am b/include/OggFLAC++/Makefile.am
index 3b50cb0..75aad71 100644 (file)
--- a/include/OggFLAC++/Makefile.am
+++ b/include/OggFLAC++/Makefile.am
@@ -16,9 +16,9 @@
 #  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #  Boston, MA  02111-1307, USA.
 
-includedir = ${prefix}/include/OggFLAC++
+oggflaccppincludedir = $(includedir)/OggFLAC++
 
-include_HEADERS = \
+oggflaccppinclude_HEADERS = \
        all.h \
        decoder.h \
        encoder.h

diff --git a/include/OggFLAC/Makefile.am b/include/OggFLAC/Makefile.am
index 3dee41c..7021a14 100644 (file)
--- a/include/OggFLAC/Makefile.am
+++ b/include/OggFLAC/Makefile.am
@@ -16,12 +16,12 @@
 #  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #  Boston, MA  02111-1307, USA.
 
-includedir = ${prefix}/include/OggFLAC
+oggflaccincludedir = $(includedir)/OggFLAC
 
 # NOTE: file_decoder.h and seekable_stream_decoder.h are NOT ready
 # for distribution yet.
 
-include_HEADERS = \
+oggflaccinclude_HEADERS = \
        all.h \
        stream_decoder.h \
        stream_encoder.h