--- Imakefile.orig	Mon Jul  1 10:14:46 2002
+++ Imakefile	Mon Jul  1 10:18:21 2002
@@ -6,13 +6,16 @@
 
 #undef USE_VOODOO
 
-BINDIR = /usr/local/bin
+BINDIR = ${PREFIX}/bin
+XCOMM BINDIR = /usr/local/bin
 
-#define MASCOTDIR /usr/local/lib/ActX
+XCOMM #define MASCOTDIR /usr/local/lib/ActX
 
-MASCOTDIR = /usr/local/lib/ActX
+MASCOTDIR = ${PREFIX}/share/examples/actx
+XCOMM MASCOTDIR = /usr/local/lib/ActX
 
-DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\"
+DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/share/examples/actx\"
+XCOMM DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\"
 
 #define INSTALL_DEFAULTMENU
 
@@ -34,7 +37,7 @@
 EXTRA_LIBRARIES += -lXpm
 
 AllTarget(actx)
-NormalProgramTarget(actx,$(OBJS),,$(LOCAL_LIBRARIES),$(XPMLIB))
+NormalProgramTarget(actx,$(OBJS),$(LOCAL_LIBRARIES),XawClientLibs,$(XPMLIB))
 
 InstallManPage(actx,$(MANDIR))
 
@@ -69,11 +72,11 @@
 
 DEFINES = $(DEFINES_I18N) $(DEFINES_VOODOO) $(DEFINES_XAW5) $(DEFINES_AW) $(DEFINES_MASCOTDIR)
 
-InstallNamedNonExec(biff.xpm,biff.xpm,MASCOTDIR)
+InstallNamedNonExec(biff.xpm,biff.xpm,$(MASCOTDIR))
 
 #ifdef INSTALL_DEFAULTMENU
 	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc
-	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc-sp
+XCOMM	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc-sp
 	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc-one $(MASCOTDIR)/sample.actxrc-one
 #endif