--- fvwm/Imakefile.orig	Sun May 30 11:05:19 1999
+++ fvwm/Imakefile	Sun May 30 11:06:45 1999
@@ -16,7 +16,7 @@
 
 DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib
 #else 
 #ifdef HPArchitecture
--- modules/FvwmAudio/Imakefile.orig	Sun May 30 11:12:57 1999
+++ modules/FvwmAudio/Imakefile	Sun May 30 11:13:13 1999
@@ -29,7 +29,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib  
 #else
 LOCAL_LIBRARIES = -L../../libs -lfvwmlib  
--- modules/FvwmAuto/Imakefile.orig	Sun May 30 11:13:27 1999
+++ modules/FvwmAuto/Imakefile	Sun May 30 11:13:36 1999
@@ -13,7 +13,7 @@
 
 DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib  
 #else
 LOCAL_LIBRARIES = -L../../libs -lfvwmlib  
--- modules/FvwmBacker/Imakefile.orig	Sun May 30 11:13:54 1999
+++ modules/FvwmBacker/Imakefile	Sun May 30 11:14:03 1999
@@ -14,7 +14,7 @@
 
 DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib  
 #else
 LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib  
--- modules/FvwmBanner/Imakefile.orig	Sun May 30 11:14:13 1999
+++ modules/FvwmBanner/Imakefile	Sun May 30 11:14:26 1999
@@ -15,7 +15,7 @@
 
 DEPLIBS = $(DEPXLIB) 
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib  
 #else
 LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib  
--- modules/FvwmClean/Imakefile.orig	Sun May 30 11:14:38 1999
+++ modules/FvwmClean/Imakefile	Sun May 30 11:14:46 1999
@@ -13,7 +13,7 @@
 
 DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib  
 #else
 LOCAL_LIBRARIES = -L../../libs -lfvwmlib  
--- modules/FvwmDebug/Imakefile.orig	Sun May 30 11:15:12 1999
+++ modules/FvwmDebug/Imakefile	Sun May 30 11:15:21 1999
@@ -12,7 +12,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a   
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib     
 #else
 LOCAL_LIBRARIES = -L../../libs -lfvwmlib     
--- modules/FvwmIconBox/Imakefile.orig	Sun May 30 11:15:38 1999
+++ modules/FvwmIconBox/Imakefile	Sun May 30 11:15:47 1999
@@ -16,7 +16,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a   
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib     
 #else
 LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib     
--- modules/FvwmIdent/Imakefile.orig	Sun May 30 11:16:00 1999
+++ modules/FvwmIdent/Imakefile	Sun May 30 11:16:07 1999
@@ -12,7 +12,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a   
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib     
 #else
 LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib     
--- modules/FvwmPager/Imakefile.orig	Sun May 30 11:16:19 1999
+++ modules/FvwmPager/Imakefile	Sun May 30 11:16:28 1999
@@ -13,7 +13,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a   
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib     
 #else
 LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib     
--- modules/FvwmSave/Imakefile.orig	Sun May 30 11:16:48 1999
+++ modules/FvwmSave/Imakefile	Sun May 30 11:16:58 1999
@@ -12,7 +12,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a   
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib     
 #else
 LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib     
--- modules/FvwmSaveDesk/Imakefile.orig	Sun May 30 11:17:22 1999
+++ modules/FvwmSaveDesk/Imakefile	Sun May 30 11:17:32 1999
@@ -12,7 +12,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a   
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib     
 #else
 LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib     
--- modules/FvwmScroll/Imakefile.orig	Sun May 30 11:17:46 1999
+++ modules/FvwmScroll/Imakefile	Sun May 30 11:17:54 1999
@@ -12,7 +12,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a   
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib     
 #else
 LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib     
--- modules/FvwmWinList/Imakefile.orig	Sun May 30 11:18:06 1999
+++ modules/FvwmWinList/Imakefile	Sun May 30 11:18:14 1999
@@ -14,7 +14,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a   
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib     
 #else
 LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib     
--- modules/GoodStuff/Imakefile.orig	Sun May 30 11:18:25 1999
+++ modules/GoodStuff/Imakefile	Sun May 30 11:18:34 1999
@@ -16,7 +16,7 @@
 
 DEPLIBS = $(DEPXLIB)  ../../libs/libfvwmlib.a   
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib     
 #else
 LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib     
--- xpmroot/Imakefile.orig	Sun May 30 11:24:14 1999
+++ xpmroot/Imakefile	Sun May 30 11:24:22 1999
@@ -15,7 +15,7 @@
 
 DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a
 
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib
 #else
 LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../libs -lfvwmlib