--- editkit/Imakefile.orig	Sat Mar 11 00:11:23 2006
+++ editkit/Imakefile	Fri Aug  4 19:13:21 2006
@@ -33,7 +33,9 @@
 XCOMM Compile options:
 XCOMM
 
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
+COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -I${X11BASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib
+
+CCOPTIONS=${COPTS}
 
 LOCAL_LIBRARIES=$(XLIB)
 DEPLIBS=		# I don't know what I'm doing, and I hate imake!
@@ -45,7 +47,7 @@
 
 x11.o:
 	ln -sf MANUAL.emacs emx.man
-	$(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c
+	$(CC) $(COPTS) ${CFLAGS} -DEMACS -o x11.o -c x11.c
 
 install.man::
 	if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \
@@ -55,9 +57,9 @@
 
 install::
 	mkdir -p $(SHAREDIR)
-	cp -f rc.example $(SHAREDIR)/rc.common
-	cd $(SHAREDIR); ln -sf rc.common emxrc
-	cp -f README $(SHAREDIR)
+	${BSD_INSTALL_DATA} rc.example $(SHAREDIR)/rc.common
+	${BSD_INSTALL_DATA} $(SHAREDIR); ln -sf rc.common emxrc
+	${BSD_INSTALL_DATA} README $(SHAREDIR)
 
 clean::
 	rm -f core *~ emx.man