--- Common.tmpl~	Tue Nov 23 14:11:56 1999
+++ Common.tmpl	Tue Nov 23 14:17:32 1999
@@ -35,22 +35,22 @@
 */
 
 /* Uncomment and modify if you have the JPEG 6 library */
-/*
 #define Use_JPEG
-JPEGDIR = /usr/local
-JPEGINCLUDE = -I$(JPEGDIR)/include
-JPEGLIB = -L$(JPEGDIR)/lib -ljpeg$(IMGLEXT)
+JPEGDIR = /usr
+JPEGINCLUDE =
+JPEGLIB = -ljpeg$(IMGLEXT)
 JPEGDEPLIB = $(JPEGDIR)/lib/libjpeg$(IMGLEXT).a
+/*
 */
 
 /* Uncomment and modify if you have the PNG library */
 /*
+*/
 #define Use_PNG
-PNGDIR = /usr/local
-PNGINCLUDE = -I$(PNGDIR)/include
-PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT)
+PNGDIR = /usr
+PNGINCLUDE =
+PNGLIB = -lpng$(IMGLEXT) -lz$(IMGLEXT)
 PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
-*/
 
 /* Tells Imakefile to set the flags for debugging.  Comment for -O. */
 #define CDebugging 1
--- image/image_endian.h~	Sun May 30 17:43:52 1999
+++ image/image_endian.h	Tue Nov 23 14:31:09 1999
@@ -48,7 +48,7 @@
 #define __VAX__ 1
 #endif
 
-#if defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__QNX__)
+#if defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__QNX__) || defined(__arm__)
 #undef  CHIMERA_BIG_ENDIAN
 #define CHIMERA_LITTLE_ENDIAN
 #endif