[cairo-commit] cairo/src Makefile.am,1.46,1.47

Carl Worth commit at pdx.freedesktop.org
Tue May 3 08:16:49 PDT 2005


Committed by: cworth

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

Modified Files:
	Makefile.am 
Log Message:

        * TODO: Add suggestion for copy-on-write regions to fix clip
        region problems.

        * src/Makefile.am (install-data-local): Fix check for old headers
        to respect DESTDIR, (to work better when cross-compiling, etc.).
        Thanks to Luke-Jr <luke-jr at utopios.org>.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Makefile.am	26 Apr 2005 19:38:06 -0000	1.46
+++ Makefile.am	3 May 2005 15:16:47 -0000	1.47
@@ -124,7 +124,7 @@
 libcairo_la_LIBADD = $(CAIRO_LIBS)
 
 install-data-local:
-	@if test -f $(includedir)/cairo.h || test -f $(includedir)/cairo-features.h ; then \
+	@if test -f "$(DESTDIR)$(includedir)/cairo.h" || test -f "$(DESTDIR)$(includedir)/cairo-features.h" ; then \
 	  echo "****************************************************************" ;	\
 	  echo "*** Error: Old headers found. You should remove the following" ;	\
 	  echo "***        files and then type 'make install' again." ;			\




More information about the cairo-commit mailing list