From 5707a69bfc9ce5525b2177f68c4e810c84b2f73f Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Fri, 4 Feb 2005 08:04:36 +0000 Subject: [PATCH] Generate an error during make install if old cairo headers are found in includedir, (rather than includedir/cairo where the new ones are going). --- ChangeLog | 6 ++++++ src/Makefile.am | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 035cad0a5..45ad194ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-04 Carl Worth + + * 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). + 2005-02-03 Owen Taylor * src/cairo_ft_font.c (_cairo_ft_font_text_to_glyphs, diff --git a/src/Makefile.am b/src/Makefile.am index a7090d319..3f76d2726 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -121,3 +121,13 @@ libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined 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