$FreeBSD$

--- Imakefile.orig	Thu Feb 28 08:36:28 2002
+++ Imakefile	Fri Jun  7 21:25:06 2002
@@ -1,14 +1,16 @@
 XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
+DESTDIR=
+
+PREFIX=/usr/X11R6
 
 XCOMM Name of man subdirectory of DESTDIR:
-MANDIR=/X11R6/man/man1
+MANDIR=$(PREFIX)/man/man1
 
 XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just  /bin
-BINDIR=/X11R6/bin
+BINDIR=$(PREFIX)/bin
 
 XCOMM Name of share subdirectory of DESTDIR:
-SHAREDIR=/share/rmap
+SHAREDIR=$(PREFIX)/share/rmap
 
 XCOMM Name of PostScript viewer, image viewer and default print command
 PS_VIEWER=gv
@@ -24,7 +26,7 @@
 #ifdef HPArchitecture
 ZLIBDIR=
 
-CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\"
+CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\"
 #else
 # SunOS
 
@@ -34,7 +36,7 @@
 # Solaris, Linux
 #ZLIBDIR=-L/usr/lib
 
-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\"
+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\"
 #endif
 
 SRCS=xrmap.c
@@ -51,7 +53,7 @@
 ComplexProgramTarget(xrmap)
 
 install.man::
-	if [ -r $(DESTDIR)$(MANDIR)/xrmap.1x.gz ] ; \
+	if [ -r $(MANDIR)/xrmap.1x.gz ] ; \
 	   then gzip -f $(DESTDIR)$(MANDIR)/xrmap.1x ; fi
 
 install:: install.man
@@ -65,7 +67,6 @@
 	if [ -d factbook ] ; then cp -fR factbook $(DESTDIR)$(SHAREDIR) ; fi
 	if [ -d anthems ] ; then cp -fR anthems $(DESTDIR)$(SHAREDIR) ; fi
 	if [ -d hymns ] ; then cp -fR hymns $(DESTDIR)$(SHAREDIR) ; fi
-	cat WARNING
 
 clean::
 	cd tools ; make clean