--- Imakefile.orig	Mon Oct 26 09:16:54 1998
+++ Imakefile	Mon Oct 26 09:27:43 1998
@@ -48,8 +48,10 @@
 /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
 
 /**/# For a generic Solaris 2.x system, I'd suggest
-MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
+/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
 
+/**/# For FreeBSD
+MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DMAXPID=30000 -DREGEXP -DXPM -DXVIEW32
 /**/#
 /**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
 /**/# want to include XPM support.  For a generic Solaris 1.x
@@ -57,8 +59,11 @@
 /**/#MORELDFLAGS=-L${OPENWINHOME}/lib
 /**/#
 /**/# For Solaris 2.x, I'd suggest
-MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
+/**/#MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
 
+/**/# For FreeBSD
+MORELDFLAGS=-L$(USRLIBDIR) -lXpm
+XPMINCDIR=-I$(INCROOT)/X11
 
 /**/# No more changes needed
 
@@ -72,6 +77,7 @@
 SYS_LIBRARIES = -ll -lm
 INCLUDES = -I$(HEADER_DEST) -I$(TOP) $(XPMINCDIR) 
 DEPLIBS = 
+EXTENSIONLIB = -lXext
 LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
 
 HEADERS = cmdstream.h cursors.h debug.h defaults.h dsdm.h environ.h error.h \
@@ -115,26 +121,29 @@
 	${HEADERS} ${BITMAPS} ${SRCS} \
 	${MISC} ${INFOFILES} ${MANPAGES} ${SCRIPTS}
 
-ComplexProgramTarget(olvwm)
-
-#if NeedMenuFile
-InstallNonExecList($(MISC),$(LIBRARY_DEST))
-#endif
+depend:: olvwmrc.c
 
 parse.c: parse.l
-	lex -t parse.l > parse.c
+	$(LEX) $(LFALGS) parse.l
+	$(MV) lex.yy.c parse.c
 
-olvwmrc.c: olvwmrc.y
-	yacc olvwmrc.y
-	mv y.tab.c olvwmrc.c
+olvwmrc.c: parse.c olvwmrc.y
+	$(YACC) olvwmrc.y
+	$(MV) y.tab.c olvwmrc.c
 
 olvwmrc.o: parse.c olvwmrc.c
 
+ComplexProgramTarget(olvwm)
+
+#if NeedMenuFile
+InstallNonExecList($(MISC),$(LIBRARY_DEST))
+#endif
+
 version.c: ${SRCS} ${HEADERS}
 	@echo '#ident "@(#)olvwm version compiled '`date`'"' > version.c
 
 clean::
-	/bin/rm -f parse.c olvwmrc.c version.c
+	/bin/rm -f parse.c olvwmrc.c version.c .depend
 
 install.man:: $(MANPAGES)
 	@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
@@ -142,7 +151,11 @@
 	@for i in $(MANPAGES) ;\
 	do \
 	echo "installing $$i"; \
+	$(RM) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX)* ; \
 	$(INSTALL) -c $(INSTMANFLAGS) $$i $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
+	$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
 	done
+
+depend:: olvwmrc.c
 
 #include <XView.prog>