[cairo-commit] cairo/src Makefile.am,1.38,1.39

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv2871/src

Modified Files:
	Makefile.am 
Log Message:

        * src/Makefile.am: Generate an error during make install if old
        cairo headers are found in includedir, (rather than
        includedir/cairo where the new ones are going).


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile.am	2 Feb 2005 05:45:52 -0000	1.38
+++ Makefile.am	4 Feb 2005 16:04:36 -0000	1.39
@@ -121,3 +121,13 @@
 INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS)
 
 libcairo_la_LIBADD = $(CAIRO_LIBS)
+
+install-data-local:
+	@if test -f $(includedir)/cairo.h || test -f $(includedir)/cairo-features.h ; then \
+	  echo "****************************************************************" ;	\
+	  echo "*** Error: Old headers found. You should remove the following" ;	\
+	  echo "***        files and then type 'make install' again." ;			\
+	  ls $(includedir)/cairo*.h ;							\
+	  echo "****************************************************************" ;	\
+	  false ;									\
+        fi