--- editkit/Imakefile.orig	Tue Aug  2 00:14:15 2005
+++ editkit/Imakefile	Fri Nov 25 22:47:48 2005
@@ -1,20 +1,20 @@
 XCOMM Should install to /usr or /usr/local ??
 #ifndef DESTDIR
-DESTDIR=/usr
+DESTDIR=${PREFIX}
 #endif
 
 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_XRMAP:
 SHAREDIR=$(DESTDIR)/share/editkit
 
 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 Normally -- except for new architectures -- you should be done there.
@@ -23,7 +23,7 @@
 XCOMM Compile options:
 XCOMM
 
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
+CFLAGS += -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
 
 LOCAL_LIBRARIES=$(XLIB)
 DEPLIBS=		# I don't know what I'm doing, and I hate imake!
@@ -38,8 +38,6 @@
 	$(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c
 
 install.man::
-	if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \
-	   then gzip -f $(DESTDIR)$(MANDIR)/emx.1 ; fi
 	if [ -r $(DESTDIR)$(MANDIR)/emx.1x.gz ] ; \
 	   then gzip -f $(DESTDIR)$(MANDIR)/emx.1x ; fi
 
