Merge patch from JeremyF:

67-dist

Fixes to various places Makefile.am to generate proper distributions.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1350

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 69e64bb72c5808994a8b4430104e7044a4299e8e..67c5b915413cfca70a0103da2ad57a65d3101b59 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -27,7 +27,9 @@ mcincludedir = $(includedir)/valgrind
 mcinclude_HEADERS = \
        memcheck.h
 
-noinst_HEADERS = \
+noinst_HEADERS =       \
+       mc_common.h     \
+       mc_constants.h  \
        mc_include.h
 
 ##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)

diff --git a/valgrind.spec.in b/valgrind.spec.in
index a217b2833f2559ba57dcebe10055a5a3e8a474b5..39d61b203f96518389712a8142b4eae8edab5291 100644 (file)
--- a/valgrind.spec.in
+++ b/valgrind.spec.in
@@ -4,7 +4,7 @@ Version: @VERSION@
 Release: 1
 Copyright: GPL
 Group: Development/Debuggers
-Packager: Frederic Gobry  <frederic.gobry@smartdata.ch>
+Packager: Jeremy Fitzhardinge <jeremy@goop.org>
 Source: @PACKAGE@-@VERSION@.tar.bz2
 
 Buildroot: %{_tmppath}/@PACKAGE@
@@ -38,7 +38,9 @@ make install prefix=$RPM_BUILD_ROOT/usr
 
 %files
 %defattr(-,root,root)
-/usr/include/valgrind.h
+/usr/include/valgrind/valgrind.h
+/usr/include/valgrind/memcheck.h
+/usr/include/valgrind/helgrind.h
 /usr/bin/valgrind
 /usr/bin/cg_annotate
 /usr/lib/valgrind/*