--- Magick.tmpl.orig	Wed Mar 11 21:28:31 1998
+++ Magick.tmpl	Thu Mar 19 09:58:46 1998
@@ -43,11 +43,11 @@
 XCOMM Set DoSharedLib to HasSharedLibraries to build ImageMagick with shared
 XCOMM libraries.
 XCOMM
-XCOMM #define DoSharedLib  HasSharedLibraries
+#define DoSharedLib  HasSharedLibraries
 
 XCOMM Define the location of the X11 RGB color database.
 XCOMM
-XCOMM DATABASE_DEFINES= -DRGBColorDatabase=\"/usr/openwin/lib/X11/rgb.txt\"
+DATABASE_DEFINES= -DRGBColorDatabase=\"/usr/X11R6/lib/X11/rgb.txt\"
 
 XCOMM By default, the maximum color value is 255.  To increase the maximum to
 XCOMM 65535 define:
@@ -67,12 +67,12 @@
 XCOMM #define HasFPX
 XCOMM #define HasHDF
 XCOMM #define HasJBIG
-XCOMM #define HasJPEG
-XCOMM #define HasMPEG
-XCOMM #define HasPNG
-XCOMM #define HasTIFF
+#define HasJPEG
+#define HasMPEG
+#define HasPNG
+#define HasTIFF
 XCOMM #define HasTTF
-XCOMM #define HasZLIB
+#define HasZLIB
 
 #ifdef HasDPS
 DPS_DEFINES= -DHasDPS
@@ -104,29 +104,29 @@
 
 #ifdef HasJPEG
 JPEG_DEFINES= -DHasJPEG
-JPEG_INCLUDES= -I$(TOP)/jpeg
-JPEG_FLAGS= -L$(TOP)/jpeg
+JPEG_INCLUDES= -I${LOCALBASE}/include
+JPEG_FLAGS= -L${LOCALBASE}/lib
 JPEG_LIBRARIES= -ljpeg
 #endif
 
 #ifdef HasMPEG
 MPEG_DEFINES= -DHasMPEG
-MPEG_INCLUDES= -I$(TOP)/mpeg
-MPEG_FLAGS= -L$(TOP)/mpeg
+MPEG_INCLUDES= -I${LOCALBASE}/include
+MPEG_FLAGS= -L${LOCALBASE}/lib
 MPEG_LIBRARIES= -lmpeg
 #endif
 
 #ifdef HasPNG
 PNG_DEFINES= -DHasPNG
-PNG_INCLUDES= -I$(TOP)/png
-PNG_FLAGS= -L$(TOP)/png
+PNG_INCLUDES= -I${LOCALBASE}/include
+PNG_FLAGS= -L${LOCALBASE}/lib
 PNG_LIBRARIES= -lpng
 #endif
 
 #ifdef HasTIFF
 TIFF_DEFINES= -DHasTIFF
-TIFF_INCLUDES= -I$(TOP)/tiff/libtiff
-TIFF_FLAGS= -L$(TOP)/tiff/libtiff
+TIFF_INCLUDES= -I${LOCALBASE}/include
+TIFF_FLAGS= -L${LOCALBASE}/lib
 TIFF_LIBRARIES= -ltiff
 #endif
 
@@ -139,8 +139,8 @@
 
 #ifdef HasZLIB
 ZLIB_DEFINES= -DHasZLIB
-ZLIB_INCLUDES= -I$(TOP)/zlib
-ZLIB_FLAGS= -L$(TOP)/zlib
+ZLIB_INCLUDES= 
+ZLIB_FLAGS= 
 ZLIB_LIBRARIES= -lz
 #endif
 
@@ -156,16 +156,12 @@
 XCOMM ImageMagick has an include file named X.h.  Do not set LOCALINC to
 XCOMM the top level X11 include directory or X11/X.h will be overwritten.
 
-#ifndef PREFIX
-PREFIX=/usr/local
-#endif
-
 LOCALDIR= $(PREFIX)/bin
 LOCALINC= $(PREFIX)/include/magick
 LOCALLIB= $(PREFIX)/lib
-LOCALMAN1= $(PREFIX)/man/man1
-LOCALMAN4= $(PREFIX)/man/man4
-LOCALMAN5= $(PREFIX)/man/man5
+LOCALMAN1= $(PREFIX)/man/cat1
+LOCALMAN4= $(PREFIX)/man/cat4
+LOCALMAN5= $(PREFIX)/man/cat5
 
 MAGICKDIR= $(TOP)/magick
 MAGICK_INCLUDES= -I$(TOP)/magick