Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.6
diff -u -p -r1.6 ChangeLog
--- ChangeLog	9 Apr 2003 10:36:02 -0000	1.6
+++ ChangeLog	9 Apr 2003 13:46:00 -0000
@@ -1,3 +1,9 @@
+2003-04-09  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* image/Imakefile (EXTRA_INCLUDES): change the order of includes,
+	to avoid that an older installed forms.h is used instead of the
+	fresh one
+
 2003-04-08  Angus Leeming  <angus.leeming@btopenworld.com>
 
 	* image/image_rotate.c (flimage_rotate): enable the rotation of
Index: image/Imakefile
===================================================================
RCS file: /cvsroot/xforms/xforms/image/Imakefile,v
retrieving revision 1.1
diff -u -p -r1.1 Imakefile
--- image/Imakefile	6 Apr 2003 15:52:39 -0000	1.1
+++ image/Imakefile	9 Apr 2003 13:46:00 -0000
@@ -79,12 +79,12 @@ JPEGLIBDIR	= -L$(JPEGLIBLOC)
 #endif
 
 EXTRA_INCLUDES	= \
-		  $(XPMINCDIR) \
-		  $(TIFFINCDIR) \
-		  $(JPEGINCDIR) \
 		  -I$(BUILDINCDIR) \
 		  -I$(TOP)/lib \
 		  -I$(TOP)/lib/private \
+		  $(XPMINCDIR) \
+		  $(TIFFINCDIR) \
+		  $(JPEGINCDIR) \
 		  -I.
 
 DEPEND_DEFINES	= \