--- xfce/Imakefile.orig	Wed Oct 21 09:11:00 1998
+++ xfce/Imakefile	Tue Nov 17 14:28:44 1998
@@ -20,10 +20,10 @@
 
 XCOMM And then, use the right directory as extra include
 XCOMM for LINUX: 
-XCOMM EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm 
+EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm 
 
 XCOMM for static link with XForms
-EXTRA_LIBRARIES = $(USRLIBDIR)/libforms.a -L/usr/local/lib -lXpm -lm
+XCOMM EXTRA_LIBRARIES = $(USRLIBDIR)/libforms.a -L/usr/local/lib -lXpm -lm
 
 XCOMM for SOLARIS 2.5.1
 XCOMM EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm -lsocket
@@ -52,15 +52,13 @@
 
 
 install.bin::  	$(PROGRAMS) install.man
-	@umask 022
 	@if [ -d $(DEST_BIN) ]; then set +x; \
 	else (set -x; $(MKDIRHIER) $(DEST_BIN)); fi
-	@cp -vf $(PROGRAMS) $(DEST_BIN);
-	(cd $(DEST_BIN); ln -svf $(PROG1) XFCE);
+	@cp $(PROGRAMS) $(DEST_BIN);
+	(cd $(DEST_BIN); ln -s $(PROG1) XFCE);
 	@chmod 0755 $(DEST_BIN)/$(PROG1);
 	@chmod 0755 $(DEST_BIN)/$(PROG2);
 
 install::	install.bin
-	@umask 022
 	@mkdir -p $(DEST_XFCE)
-	@cp -vpf XFce2.logo $(DEST_XFCE);
+	@cp XFce2.logo $(DEST_XFCE);
