libXmu: Branch 'master'

[Gaetan Nadon]

 Makefile.am         |    1 -
 include/Makefile.am |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit af962b3bed9d3c42cf81946a5732f0d37d1843e8
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Wed May 26 17:01:57 2010 -0400

    config: add WhitePoint.h to the include headers
    
    This file was added in commit 8c5b2278580193578cdd0da8c8e948e74f8a3f26
    because it was missing from the tarball. It was added to
    EXTRA_DIST so it never got installed in $includedir.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/Makefile.am b/Makefile.am
index e505efd..c258919 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xmu.pc xmuu.pc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = include/X11/Xmu/WhitePoint.h
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/include/Makefile.am b/include/Makefile.am
index f28021f..413dd5b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,4 +21,5 @@ xmuinclude_HEADERS = \
 	X11/Xmu/SysUtil.h \
 	X11/Xmu/WidgetNode.h \
 	X11/Xmu/WinUtil.h \
-	X11/Xmu/Xct.h
+	X11/Xmu/Xct.h \
+	X11/Xmu/WhitePoint.h