--- goodies/Imakefile.orig	Wed Oct 21 09:11:00 1998
+++ goodies/Imakefile	Tue Nov 17 14:36:44 1998
@@ -1,64 +1,45 @@
 #include "../XFCE.def"
 
 install.palettes::
-	umask 000
 	mkdir -p $(DEST_PAL)
 	chmod a+w $(DEST_PAL)
-	cp -vpf palettes\/* $(DEST_PAL)
+	cp palettes\/* $(DEST_PAL)
 
 install.help::
-	umask 022
 	mkdir -p $(DEST_HELP)
-	cp -vdfR help\/* $(DEST_HELP)
+	cp -R help\/* $(DEST_HELP)
 	chmod -R a+r $(DEST_HELP)
 
 install.icons::
-	umask 022
 	mkdir -p $(DEST_ICONS)
-	cp -vpf icons\/* $(DEST_ICONS)
+	cp icons\/* $(DEST_ICONS)
 	chmod -R a+r $(DEST_ICONS)
 
 install.sounds::
-	umask 022
 	mkdir -p $(DEST_SOUNDS)
-	cp -vpf sounds\/* $(DEST_SOUNDS)
+	cp sounds\/* $(DEST_SOUNDS)
 	chmod -R a+r $(DEST_SOUNDS)
 
 install.backdrops::
-	umask 022
 	mkdir -p $(DEST_BACKDROPS)
-	cp -vpf backdrops\/* $(DEST_BACKDROPS)
+	cp backdrops\/* $(DEST_BACKDROPS)
 	chmod -R a+r $(DEST_BACKDROPS)
 
 install.sample::
-	umask 022
-	@cp -vpf sample.* $(DEST_XFCE)/;
+	@cp sample.* $(DEST_XFCE)/;
 	(cd $(DEST_XFCE);\
-	ln -svf sample.fvwmrc  system.fvwmrc;\
-	ln -svf sample.fvwm2rc system.fvwm2rc;\
-	ln -svf sample.xfwmrc  system.xfwmrc;)
+	ln -s sample.fvwmrc  system.fvwmrc;\
+	ln -s sample.fvwm2rc system.fvwm2rc;\
+	ln -s sample.xfwmrc  system.xfwmrc;)
 	(cd $(DEST_XFCE);\
-	ln -svf sample.xfcerc  .xfcerc;\
-	ln -svf sample.xinitrc .xinitrc;\
-	ln -svf sample.xfbdrc  .xfbdrc;\
-	ln -svf sample.xfsoundrc  .xfsoundrc;)
+	ln -s sample.xfcerc  .xfcerc;\
+	ln -s sample.xinitrc .xinitrc;\
+	ln -s sample.xfbdrc  .xfbdrc;\
+	ln -s sample.xfsoundrc  .xfsoundrc;)
 	chmod -R a+r $(DEST_XFCE)
 	
-install.bin::
-	umask 022
-	@if [ -d $(DEST_BIN) ]; then set +x; \
-	else (set -x; $(MKDIRHIER) $(DEST_BIN)); fi
-	@cp -vpf xfce_setup $(DEST_BIN);
-	@cp -vpf xfce_remove $(DEST_BIN);
-	@cp -vpf Quickstart $(DEST_XFCE)/;
-	@chmod 0755 $(DEST_BIN)/xfce_setup;
-	@chmod 0755 $(DEST_BIN)/xfce_remove;
-	@chmod 0755 $(DEST_XFCE)/Quickstart;
-	chmod -R a+r $(DEST_XFCE)
-
-
 install:: install.palettes install.help install.icons install.backdrops \
- install.sounds install.sample install.bin
+ install.sounds install.sample
 
 all::
 	@echo Nothing to build for the goodies !
