# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1224250649 0
# Node ID dc1327c2ef5b56fd4bc6e46992f0ec5838be558e
# Parent  6911450535b7e19ba5dfc7190fdf0f6925ac7e8d
merge -c1524 branches/stable-1.4: Moved globals.h to noinst_HEADERS.

diff -r 6911450535b7 -r dc1327c2ef5b Makefile.am
--- a/Makefile.am	Fri Oct 17 13:36:43 2008 +0000
+++ b/Makefile.am	Fri Oct 17 13:37:29 2008 +0000
@@ -54,10 +54,12 @@
     script \
     tool
 
+noinst_HEADERS = \
+	globals.h
+
 EXTRA_DIST = \
 	Doxyfile \
 	FEATURES \
-	globals.h \
 	Kbuild.in \
 	README.EoE