--- /dev/null
+--- fvwm-1.24r/fvwm/Imakefile.fsstnd Fri Sep 16 10:36:44 1994
++++ fvwm-1.24r/fvwm/Imakefile Fri May 1 16:02:42 1998
+@@ -39,5 +39,5 @@
+ decorations.o colormaps.o misc.o style.o
+
+ ComplexProgramTarget(fvwm)
+-InstallNamedNonExec(../sample.fvwmrc/system.fvwmrc,system.fvwmrc,FVWMDIR)
++InstallNamedNonExec(../sample.fvwmrc/system.fvwmrc,system.fvwmrc,/etc/X11/fvwm)
+
+--- fvwm-1.24r/configure.h.fsstnd Mon Nov 28 16:08:47 1994
++++ fvwm-1.24r/configure.h Fri May 1 16:09:45 1998
+@@ -1,7 +1,7 @@
+-#define FVWMDIR "/usr/lib/X11/fvwm"
++#define FVWMDIR "/usr/X11R6/lib/X11/fvwm"
+ /* #define FVWMDIR "/local/homes/dsp/nation/modules"*/
+-#define FVWM_ICONDIR "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
+-#define FVWMRC "/usr/lib/X11/fvwm/system.fvwmrc"
++#define FVWM_ICONDIR "/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/X11/pixmaps:/usr/share/icons"
++#define FVWMRC "/etc/X11/fvwm/system.fvwmrc"
+
+ /* Imake command needed to put modules in desired target location */
+ /* Use the second version if it causes grief */
+@@ -14,7 +14,7 @@
+ * If you want to install it in a different directory, uncomment and
+ * edit the first line */
+ /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/
+-#define FVWM_BIN_DIR BINDIR=/usr/bin/X11
++#define FVWM_BIN_DIR BINDIR=/usr/X11R6/bin
+ /*#define FVWM_BIN_DIR*/
+
+ /* Compiler over-ride for Imakefiles */
--- /dev/null
+--- fvwm-1.24r/modules/GoodStuff/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/GoodStuff/Imakefile Wed Sep 4 09:57:21 1996
+@@ -10,6 +10,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ #ifdef XPM
+ XPMLIB = XPMLIBRARY
+ #endif
+--- fvwm-1.24r/modules/FvwmBanner/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmBanner/Imakefile Wed Sep 4 09:57:54 1996
+@@ -10,6 +10,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ #ifdef XPM
+ XPMLIB = XPMLIBRARY
+
+--- fvwm-1.24r/modules/FvwmDebug/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmDebug/Imakefile Wed Sep 4 09:57:46 1996
+@@ -10,6 +10,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+ #if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+--- fvwm-1.24r/modules/FvwmClean/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmClean/Imakefile Wed Sep 4 09:57:51 1996
+@@ -10,6 +10,7 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+--- fvwm-1.24r/modules/FvwmSave/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmSave/Imakefile Wed Sep 4 09:57:33 1996
+@@ -10,6 +10,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+ #if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+--- fvwm-1.24r/modules/FvwmIdent/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmIdent/Imakefile Wed Sep 4 09:57:39 1996
+@@ -10,6 +10,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+ #if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+--- fvwm-1.24r/modules/FvwmPager/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmPager/Imakefile Wed Sep 4 09:57:36 1996
+@@ -11,6 +11,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+ #if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+--- fvwm-1.24r/modules/FvwmWinList/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmWinList/Imakefile Wed Sep 4 09:57:24 1996
+@@ -12,6 +12,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+ #if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+--- fvwm-1.24r/modules/FvwmScroll/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmScroll/Imakefile Wed Sep 4 09:57:27 1996
+@@ -10,6 +10,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+ #if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+--- fvwm-1.24r/modules/FvwmBacker/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmBacker/Imakefile Wed Sep 4 09:57:58 1996
+@@ -12,6 +12,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+ #if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+--- fvwm-1.24r/modules/FvwmAudio/Imakefile.marc Wed Sep 4 09:54:41 1996
++++ fvwm-1.24r/modules/FvwmAudio/Imakefile Wed Sep 4 09:56:29 1996
+@@ -12,6 +12,7 @@
+
+ /* #define HAVE_RPLAY */
+
++MANSUFFIX = 1fvwm
+
+ #ifdef HAVE_RPLAY
+ AUDIO_DEFINES = -DHAVE_RPLAY
+--- fvwm-1.24r/modules/FvwmIconBox/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmIconBox/Imakefile Wed Sep 4 09:57:43 1996
+@@ -10,6 +10,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ #ifdef XPM
+ XPMLIB = XPMLIBRARY
+ #endif
+--- fvwm-1.24r/modules/FvwmSaveDesk/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmSaveDesk/Imakefile Wed Sep 4 09:57:30 1996
+@@ -10,6 +10,8 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
++
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+ #if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+--- fvwm-1.24r/modules/FvwmAuto/Imakefile.marc Wed Sep 4 09:42:04 1996
++++ fvwm-1.24r/modules/FvwmAuto/Imakefile Wed Sep 4 09:58:02 1996
+@@ -10,6 +10,7 @@
+
+ COMPILER
+
++MANSUFFIX = 1fvwm
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+--- fvwm-1.24r/Imakefile.marc Wed Sep 4 09:51:04 1996
++++ fvwm-1.24r/Imakefile Wed Sep 4 09:51:17 1996
+@@ -28,7 +28,7 @@
+ modules/FvwmWinList
+
+ #ifdef XPM
+-XPMSUBDIRS = xpmroot modules/FvwmBanner
++XPMSUBDIRS = modules/FvwmBanner
+ #endif
+
+ SUBDIRS = $(ALLSUBDIRS) $(XPMSUBDIRS) $(SHAPESUBDIRS)
--- /dev/null
+--- fvwm-1.24r/modules/GoodStuff/Imakefile.orig Wed Sep 14 14:18:20 1994
++++ fvwm-1.24r/modules/GoodStuff/Imakefile Thu Nov 2 20:57:05 1995
+@@ -16,7 +16,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmBanner/Imakefile.orig Wed Sep 14 14:11:32 1994
++++ fvwm-1.24r/modules/FvwmBanner/Imakefile Thu Nov 2 20:56:20 1995
+@@ -15,7 +15,7 @@
+
+ DEPLIBS = $(DEPXLIB)
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmDebug/Imakefile.orig Wed Sep 14 14:16:45 1994
++++ fvwm-1.24r/modules/FvwmDebug/Imakefile Thu Nov 2 20:56:27 1995
+@@ -12,7 +12,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmClean/Imakefile.orig Wed Sep 14 14:16:37 1994
++++ fvwm-1.24r/modules/FvwmClean/Imakefile Thu Nov 2 20:56:23 1995
+@@ -13,7 +13,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmSave/Imakefile.orig Wed Sep 14 14:17:41 1994
++++ fvwm-1.24r/modules/FvwmSave/Imakefile Thu Nov 2 20:56:45 1995
+@@ -12,7 +12,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmIdent/Imakefile.orig Wed Sep 14 14:17:18 1994
++++ fvwm-1.24r/modules/FvwmIdent/Imakefile Thu Nov 2 20:56:35 1995
+@@ -12,7 +12,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmPager/Imakefile.orig Fri Oct 7 12:49:27 1994
++++ fvwm-1.24r/modules/FvwmPager/Imakefile Thu Nov 2 20:56:39 1995
+@@ -13,7 +13,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmWinList/Imakefile.orig Wed Sep 14 14:18:10 1994
++++ fvwm-1.24r/modules/FvwmWinList/Imakefile Thu Nov 2 20:57:01 1995
+@@ -14,7 +14,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmScroll/Imakefile.orig Wed Sep 14 14:17:59 1994
++++ fvwm-1.24r/modules/FvwmScroll/Imakefile Thu Nov 2 20:56:57 1995
+@@ -12,7 +12,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmBacker/Imakefile.orig Wed Sep 21 19:21:05 1994
++++ fvwm-1.24r/modules/FvwmBacker/Imakefile Thu Nov 2 20:56:12 1995
+@@ -14,7 +14,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmAudio/Imakefile.orig Wed Sep 14 14:13:44 1994
++++ fvwm-1.24r/modules/FvwmAudio/Imakefile Thu Nov 2 20:55:45 1995
+@@ -29,7 +29,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmIconBox/Imakefile.orig Wed Sep 14 14:17:06 1994
++++ fvwm-1.24r/modules/FvwmIconBox/Imakefile Thu Nov 2 20:56:31 1995
+@@ -16,7 +16,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmSaveDesk/Imakefile.orig Wed Sep 14 14:17:50 1994
++++ fvwm-1.24r/modules/FvwmSaveDesk/Imakefile Thu Nov 2 20:56:49 1995
+@@ -12,7 +12,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib
+--- fvwm-1.24r/modules/FvwmAuto/Imakefile.orig Fri Dec 2 19:04:02 1994
++++ fvwm-1.24r/modules/FvwmAuto/Imakefile Thu Nov 2 20:56:09 1995
+@@ -13,7 +13,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = -L../../libs -lfvwmlib
+--- fvwm-1.24r/fvwm/Imakefile.orig Fri Sep 16 14:36:44 1994
++++ fvwm-1.24r/fvwm/Imakefile Thu Nov 2 20:54:35 1995
+@@ -17,7 +17,11 @@
+ DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a
+
+ #ifdef AlphaArchitecture
++#ifdef LinuxArchitecture
++LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -lfvwmlib -L../libs
++#else
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib
++#endif /* LinuxArchitecture */
+ #else
+ #ifdef HPArchitecture
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -lV3 -L../libs -lfvwmlib
+--- fvwm-1.24r/fvwm/alpha_header.h.orig Thu Nov 2 21:03:37 1995
++++ fvwm-1.24r/fvwm/alpha_header.h Thu Nov 2 21:03:53 1995
+@@ -1,3 +1,5 @@
++#ifndef __linux__
++
+ /**************************************************************************/
+ /* If I do ALL this, I can compile OK with -Wall -Wstrict-prototypes on the
+ * alpha's */
+@@ -16,3 +18,4 @@
+ extern int gethostname (char *, int);
+ /**************************************************************************/
+
++#endif
+--- fvwm-1.24r/xpmroot/Imakefile.orig Fri Nov 3 13:25:08 1995
++++ fvwm-1.24r/xpmroot/Imakefile Fri Nov 3 13:25:09 1995
+@@ -15,7 +15,7 @@
+
+ DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a
+
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(LinuxArchitecture)
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib
+ #else
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../libs -lfvwmlib