*** Imakefile.orig	Wed Aug 20 08:24:00 1997
--- Imakefile	Wed Oct  1 09:09:23 1997
***************
*** 1,7 ****
! XPIXMAPDIR    = /usr/X11/include/X11/pixmaps
! XBINDIR       = /usr/X11/bin
! XFCE_DIR      = /var/XFCE
! XFCE_PAL      = /var/XFCE/palettes
  FVWM_MODULES  = /usr/lib/X11/fvwm
  FVWM2_MODULES = /usr/lib/X11/fvwm2
  FVWM_SRC      = $(wildcard /usr/src/fvwm-1*) 
--- 1,7 ----
! XPIXMAPDIR    = /usr/X11R6/lib/X11/XFCE/pixmaps
! XBINDIR       = /usr/X11R6/bin
! XFCE_DIR      = /usr/X11R6/lib/X11/XFCE
! XFCE_PAL      = /usr/X11R6/lib/X11/XFCE/palettes
  FVWM_MODULES  = /usr/lib/X11/fvwm
  FVWM2_MODULES = /usr/lib/X11/fvwm2
  FVWM_SRC      = $(wildcard /usr/src/fvwm-1*) 
***************
*** 17,24 ****
   my_goodies.o my_string.o pulldown.o resources.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 static link with XForms
  XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm
--- 17,24 ----
   my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\
   sendinfo.o startup.o tiptools.o
  
! XCOMM for FreeBSD: 
! EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm 
  
  XCOMM for static link with XForms
  XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm
***************
*** 60,85 ****
  install_palettes::
  	mkdir -p $(XFCE_PAL)
  	chmod a+rw $(XFCE_PAL)
! 	cp -vpb 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;
  	@chmod 0755 $(XBINDIR)/XFCE;
  	@if [ -d $(FVWM_MODULES) ]; then \
! 	ln -svf $(XBINDIR)/XFCE $(FVWM_MODULES); fi
  	@if [ -d $(FVWM2_MODULES) ]; then \
! 	ln -svf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi
  	mkdir -p $(XFCE_DIR)
  	mkdir -p $(XFCE_DIR)/doc
! 	@cp -vpb sample.* $(XFCE_DIR)/;
! 	@cp -vpb INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/
! 	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;
  	@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi
  	$(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \
--- 60,85 ----
  install_palettes::
  	mkdir -p $(XFCE_PAL)
  	chmod a+rw $(XFCE_PAL)
! 	cp -R palettes\/* $(XFCE_PAL)
  
  install_bin::   	XFCE install.man
  	@if [ -d $(XBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(XBINDIR)); fi
! 	@cp -R XFCE $(XBINDIR);
! 	ln -sf $(XBINDIR)/XFCE $(XBINDIR)/xfce;
  	@chmod 0755 $(XBINDIR)/XFCE;
  	@if [ -d $(FVWM_MODULES) ]; then \
! 	ln -sf $(XBINDIR)/XFCE $(FVWM_MODULES); fi
  	@if [ -d $(FVWM2_MODULES) ]; then \
! 	ln -sf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi
  	mkdir -p $(XFCE_DIR)
  	mkdir -p $(XFCE_DIR)/doc
! 	@cp -R sample.* $(XFCE_DIR)/;
! 	@cp -R INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/
! 	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;
  	@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi
  	$(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \
***************
*** 97,126 ****
  
  install_logo::		install_bin install_palettes
  	@mkdir -p $(XFCE_DIR)
! 	@cp -vpb XFCE_full.logo $(XFCE_DIR);
! 	@cp -vpb XFCE_dithered.logo $(XFCE_DIR);
  
  install_full::		install_logo
! 	ln -svf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;
  
  install_dithered::	install_logo
! 	ln -svf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo;
  
  install::		install_full
  
  francais::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  english::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  italiano::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  deutsch::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
--- 97,126 ----
  
  install_logo::		install_bin install_palettes
  	@mkdir -p $(XFCE_DIR)
! 	@cp -R XFCE_full.logo $(XFCE_DIR);
! 	@cp -R XFCE_dithered.logo $(XFCE_DIR);
  
  install_full::		install_logo
! 	ln -sf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;
  
  install_dithered::	install_logo
! 	ln -sf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo;
  
  install::		install_full
  
  francais::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  english::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  italiano::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  deutsch::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce