--- Imakefile.orig	Sun Jun 18 23:58:50 2006
+++ Imakefile	Fri Aug  4 19:11:06 2006
@@ -1,18 +1,18 @@
 XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
+DESTDIR=${PREFIX}
 
 XCOMM Name of man subdirectory of DESTDIR:
-MANDIR=/X11R6/man/man1
+MANDIR=/man/man1
 
 XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just  /bin
-BINDIR=/X11R6/bin
+BINDIR=/bin
 
 XCOMM Name of share subdirectory of DESTDIR:
 SHAREDIR=/share/sunclock
 
 XCOMM Name of DOCDIR's subdirectories of DESTDIR:
 DOCDIR=/X11R6/lib/X11/doc 
-DOCHTMLDIR=/X11R6/lib/X11/doc/html
+DOCHTMLDIR=/lib/X11/doc/html
 
 XCOMM
 XCOMM Compile options:
@@ -42,13 +42,12 @@
 #CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
 
 # Solaris, Linux
-#XPMLIBDIR=-L/usr/X11R6/lib
-#XPMINC=-I/usr/X11R6/include/X11
-#JLIBDIR=-L/usr/lib
-#ZLIBDIR=-L/usr/lib
-#JINC=-I/usr/include
-
-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+XPMLIBDIR=-L${X11BASE}/lib
+XPMINC=-I${X11BASE}/include/X11
+JLIBDIR=-L${LOCALBASE}/lib
+ZLIBDIR=-L${LOCALBASE}/lib
+JINC=-I${LOCALBASE}/include
+CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -I${X11BASE}/include -L${LOCALBASE}/lib -L${X11BASE}/lib
 #endif
 
 SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
@@ -56,7 +55,7 @@
 OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \
      readvmf.o readxpm.o readgif.o readjpeg.o readpng.o
 LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \
-     $(JLIBDIR) -ljpeg -lpng -lm
+     $(JLIBDIR) -ljpeg -lpng -lm -lcompat
 DEPLIBS=		# I don't know what I'm doing, and I hate imake!
 
 ComplexProgramTarget(sunclock)
@@ -64,7 +63,7 @@
 all::
 	cd editkit ; xmkmf ; make emx \
           DESTDIR=$(DESTDIR) \
-	  BINDIR=$(SHAREDIR)/bin \
+	  BINDIR=/bin \
 	  MANDIR=$(SHAREDIR)/editkit \
 	  SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
 
@@ -74,14 +73,13 @@
 
 install:: install.man
 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/i18n
-	cp -f Sunclockrc $(DESTDIR)$(SHAREDIR)
-	cd i18n ; rm -f *~ ; cp -f Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n
+	${BSD_INSTALL_DATA} Sunclockrc $(DESTDIR)$(SHAREDIR)
+	cd i18n ; rm -f *~ ; ${BSD_INSTALL_DATA} Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n
 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
-	cd vmf ; rm -f *~ ; cp -f * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
-	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin
-	install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/bin
+	cd vmf ; rm -f *~ ; ${BSD_INSTALL_DATA} * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
+	${BSD_INSTALL_PROGRAM} editkit/emx $(DESTDIR)/bin
 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/editkit
-	cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \
+	cd editkit ; ${BSD_INSTALL_DATA} rc.example README MANUAL.emacs \
 		$(DESTDIR)$(SHAREDIR)/editkit
 	cd $(DESTDIR)$(SHAREDIR)/editkit ; mv -f rc.example emxrc
 	cat MESSAGE