--- Imakefile.orig	Mon Jun 23 08:23:00 1997
+++ Imakefile	Mon Sep  1 01:49:47 1997
@@ -1,9 +1,9 @@
-XPIXMAPDIR    = /usr/X11/include/X11/pixmaps
-XBINDIR       = /usr/local/bin
-XFCE_DIR      = /var/XFCE
-XFCE_PAL      = /var/XFCE/palettes
-FVWM_MODULES  = /usr/lib/X11/fvwm
-FVWM2_MODULES = /usr/lib/X11/fvwm2
+XPIXMAPDIR    = /usr/X11R6/include/X11/pixmaps
+XBINDIR       = /usr/X11R6/bin
+XFCE_DIR      = /usr/X11R6/lib/X11/XFCE
+XFCE_PAL      = /usr/X11R6/lib/X11/XFCE/palettes
+FVWM_MODULES  = /usr/X11R6/lib/X11/fvwm
+FVWM2_MODULES = /usr/X11R6/lib/X11/fvwm2
 FVWM_SRC      = $(wildcard /usr/src/fvwm-1*) 
 FVWM2_SRC     = $(wildcard /usr/src/fvwm-2*)
 
@@ -17,8 +17,8 @@
  my_string.o pulldown.o screen.o screen_cb.o selects.o sendinfo.o startup.o\
  tiptools.o
 
-XCOMM for LINUX: 
-EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm 
+XCOMM for FreeBSD: 
+EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm 
 
 XCOMM Which header file for FVWM do we use ?
 XCOMM   Use the one shipped with XFCE by default
@@ -49,38 +49,38 @@
 install_palettes::                                                    @@\
 	mkdir -p $(XFCE_PAL)				              @@\
 	chmod a+rw $(XFCE_PAL)				              @@\
-	cp -vpb palettes\/* $(XFCE_PAL)			              @@\
+	cp palettes\/* $(XFCE_PAL)			              @@\
 
 install_bin::   	XFCE install.man		              @@\
 	@if [ -d $(XBINDIR) ]; then set +x; \                         @@\
 	else (set -x; $(MKDIRHIER) $(XBINDIR)); fi                    @@\
-	@cp -vfb XFCE $(XBINDIR);                              	      @@\
-	ln -svf $(XBINDIR)/XFCE $(XBINDIR)/xfce;                      @@\
+	@cp XFCE $(XBINDIR);                              	      @@\
+	ln -sf $(XBINDIR)/XFCE $(XBINDIR)/xfce;                      @@\
 	@chmod 0755 $(XBINDIR)/XFCE;                                  @@\
 	@if [ -d $(FVWM_MODULES) ]; then \		              @@\
-	ln -svf $(XBINDIR)/XFCE $(FVWM_MODULES); fi	              @@\
+	ln -sf $(XBINDIR)/XFCE $(FVWM_MODULES); fi	              @@\
 	@if [ -d $(FVWM2_MODULES) ]; then \		              @@\
-	ln -svf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi	              @@\
+	ln -sf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi	              @@\
 	mkdir -p $(XFCE_DIR)					      @@\
-	@cp -vpb sample.fvwmrc $(XFCE_DIR)/sample.fvwmrc;             @@\
-	@cp -vpb sample.fvwm2rc $(XFCE_DIR)/sample.fvwm2rc;           @@\
-	@cp -vpb sample.xfcerc $(XFCE_DIR)/sample.xfcerc;             @@\
-	@cp -vpb sample.xinitrc $(XFCE_DIR)/sample.xinitrc;           @@\
-	ln -svf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc;        @@\
-	ln -svf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc;      @@\
-	ln -svf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc;        @@\
-	ln -svf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc;      @@\
+	@cp sample.fvwmrc $(XFCE_DIR)/sample.fvwmrc;             @@\
+	@cp sample.fvwm2rc $(XFCE_DIR)/sample.fvwm2rc;           @@\
+	@cp sample.xfcerc $(XFCE_DIR)/sample.xfcerc;             @@\
+	@cp sample.xinitrc $(XFCE_DIR)/sample.xinitrc;           @@\
+	ln -sf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc;        @@\
+	ln -sf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc;      @@\
+	ln -sf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc;        @@\
+	ln -sf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc;      @@\
 
 install_logo::		install_bin install_palettes 		      @@\
 	@mkdir -p $(XFCE_DIR)				              @@\
-	@cp -vpb XFCE_full.logo $(XFCE_DIR);			      @@\
-	@cp -vpb XFCE_dithered.logo $(XFCE_DIR);		      @@\
+	@cp XFCE_full.logo $(XFCE_DIR);			      @@\
+	@cp XFCE_dithered.logo $(XFCE_DIR);		      @@\
 
 install_full::		install_logo				      @@\
-	ln -svf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;     @@\
+	ln -sf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;     @@\
 
 install_dithered::	install_logo			              @@\
-	ln -svf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; @@\
+	ln -sf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; @@\
 
 install::		install_full                                  @@\