diff --git a/ChangeLog.n b/ChangeLog.n
index f6e5857a077f5c04d4117b9ff31bc4efd4902da0..4fa260fb0bcbd149eabd8c60c8da71cae4a8adb6 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -1,3 +1,18 @@
+Fri Dec  3 15:28:36 1993  Duane Rettig  (duane at clay)
+
+(for 4.2.devel.22 merge):
+
+	* clim-2.0/Makefile.cobjs-svr4: Add PICFLAGS/SHAREFLAGS;
+	temporarily remove mainxm.o build
+
+	* clim-2.0/Makefile.hpprism: Add CFLAGS default
+
+	* clim-2.0/Makefile.sgi4d-svr4: New file
+
+	* clim-2.0/Makefile.sun4-svr4: Add PICFLAGS/SHAREFLAGS
+
+	* clim-2.0/misc/xtsupport.c: Fix include references
+
 Tue Nov 23 12:02:05 1993  Duane Rettig  (duane at clay)
 
 (for 4.2.devel.21 merge):
diff --git a/Makefile.cobjs-svr4 b/Makefile.cobjs-svr4
index f4f0d23cd6cb6a8040e5d87fbc73820009fa265b..24f4ecc008ad2d6f2cf41c5905e89ebdf3847392 100644
--- a/Makefile.cobjs-svr4
+++ b/Makefile.cobjs-svr4
@@ -2,30 +2,34 @@
 
 climol.so:	xlibsupport.o xtsupport.o olsupport.o
 	(test -f $(setup_LLP) && eval `$(setup_LLP) openlook`; \
-	 ld -G -o climol.so xlibsupport.o xtsupport.o olsupport.o \
+	 ld $(SHAREFLAGS) -o climol.so xlibsupport.o xtsupport.o olsupport.o \
 		-lXol -lXt -lX11)
 
 climxm.so:	xlibsupport.o xtsupport.o MyDrawingA.o
 	(test -f $(setup_LLP) && eval `$(setup_LLP) motif`; \
-	 ld -G -o climxm.so xlibsupport.o xtsupport.o MyDrawingA.o \
+	 ld $(SHAREFLAGS) -o climxm.so xlibsupport.o xtsupport.o MyDrawingA.o \
 		-lXm -lXt -lX11 -lgen)
 
 xlibsupport.o	: xlib/xlibsupport.c 
-	$(CC) -c -K pic $(CFLAGS) $(XINCLUDES) -o xlibsupport.o \
+	$(CC) -c $(PICFLAGS) $(CFLAGS) $(XINCLUDES) -o xlibsupport.o \
 		xlib/xlibsupport.c
 
 xtsupport.o: misc/xtsupport.c
-	$(CC) -c -K pic $(CFLAGS) $(XINCLUDES) $(XTSUPPORTINCLUDES)\
+	$(CC) -c $(PICFLAGS) $(CFLAGS) $(XINCLUDES) $(XTSUPPORTINCLUDES)\
 		-o xtsupport.o misc/xtsupport.c
 
 MyDrawingA.o: misc/MyDrawingA.c misc/climgccursor.c
-	$(CC) -c -K pic $(CFLAGS) $(XMINCLUDES) -o MyDrawingA.o \
+	$(CC) -c $(PICFLAGS) $(CFLAGS) $(XMINCLUDES) -o MyDrawingA.o \
 		misc/MyDrawingA.c
 
 olsupport.o: misc/olsupport.c misc/climgccursor.c
-	$(CC) -c -K pic $(CFLAGS) $(OLINCLUDES) -o olsupport.o misc/olsupport.c
+	$(CC) -c $(PICFLAGS) $(CFLAGS) $(OLINCLUDES) -o olsupport.o misc/olsupport.c
 
-$(MAIN_OBJ):	stub-motif.o stub-xt.o stub-x.o
-	ld -r $(LDFLAGS) -o $(MAIN_OBJ) $(ACL_MAIN_OBJ) \
-		xlibsupport.o xtsupport.o MyDrawingA.o stub-motif.o stub-xt.o \
-		stub-x.o -lXm -lXt -lX11 -lgen
+# not needed for svr4?
+# $(MAIN_OBJ):	stub-motif.o stub-xt.o stub-x.o
+# 	ld -r $(LDFLAGS) -o $(MAIN_OBJ) $(ACL_MAIN_OBJ) \
+# 		xlibsupport.o xtsupport.o MyDrawingA.o stub-motif.o stub-xt.o \
+# 		stub-x.o -lXm -lXt -lX11 -lgen
+
+$(MAIN_OBJ):
+	cp $(ACL_MAIN_OBJ) $(MAIN_OBJ)
diff --git a/Makefile.hpprism b/Makefile.hpprism
index bc51a83f7a08d1a17e6780dfa1981c22929b4ad2..ea4a72d53b88f92a86dc4fbef66fd2b914e632d6 100644
--- a/Makefile.hpprism
+++ b/Makefile.hpprism
@@ -9,6 +9,8 @@ Makefile=Makefile.hp700
 
 CL=/usr/fi/dcl-devel
 
+CFLAGS	= -O -D_NO_PROTO -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR -DUSE_RE_COMP -DUSER_GETWD -Wp,-H1280000
+
 # 
 
 MOTIFLIB=/usr/lib/Motif1.2/libXm.a
diff --git a/Makefile.sgi4d-svr4 b/Makefile.sgi4d-svr4
new file mode 100644
index 0000000000000000000000000000000000000000..06e239376f970d8d4a14ded2b4430b3edf992995
--- /dev/null
+++ b/Makefile.sgi4d-svr4
@@ -0,0 +1,42 @@
+# $fiHeader: Makefile.svr4,v 1.3 1993/05/13 16:22:49 cer Exp $
+
+include Makefile.defs
+
+Makefile=Makefile.sgi4d-svr4
+
+MOTIFHOME=
+MOTIFLIB=
+MOTIFLIB_d=$(MOTIFHOME)/usr/lib/libXm.a
+XLIB=$(MOTIFHOME)/usr/lib/libX11$(DEBUGLIB).a 
+XTLIB=$(MOTIFHOME)/usr/lib/libXt$(DEBUGLIB).a
+XINCLUDES=-I$(MOTIFHOME)/usr/include
+XMINCLUDES=-I$(MOTIFHOME)/usr/include
+MOTIFXTRAOS=
+
+###############################################################################
+setup_LLP = /net/vapor/scm/bin/setup_LLP
+
+C_OBJECT_MAKEFILE = Makefile.cobjs-svr4
+
+XLIB-CLIM-OBJS = xlib/pkg.fasl
+
+GENERIC_PUBLIC_OBJS =
+XM_PUBLIC_OBJS =
+OL_PUBLIC_OBJS =
+PUBLIC_OBJS =
+OL_LICENSED_OBJS =
+XM_LICENSED_OBJS =
+MOTIF_OBJS = climxm.so
+OPENLOOK_OBJS = 
+CLIMOBJS= climxm.so
+CLIMFASLS= $(CLIM_XM_FASLS) $(CLIM_GENERIC_FASLS)
+INSTALLED_CLIMXMOBJS = MyDrawingA.o climxm.so
+INSTALLED_CLIMOBJS= xlibsupport.o xtsupport.o $(INSTALLED_CLIMXMOBJS)
+
+PICFLAGS = -KPIC
+SHAREFLAGS = -shared -all
+
+PWD = .
+###############################################################################
+
+include Makefile.generic
diff --git a/Makefile.sun4-svr4 b/Makefile.sun4-svr4
index edf34b86d4db985abc3f24c39e9b7b24afe66dcb..9288d452ad35ab44038cc41c989abb63374606b9 100644
--- a/Makefile.sun4-svr4
+++ b/Makefile.sun4-svr4
@@ -41,6 +41,9 @@ INSTALLED_CLIMOLOBJS = olsupport.o climol.so
 INSTALLED_CLIMOBJS= xlibsupport.o xtsupport.o \
 	$(INSTALLED_CLIMOLOBJS) $(INSTALLED_CLIMXMOBJS)
 
+PICFLAGS = -K pic
+SHAREFLAGS = -G
+
 PWD = .
 ###############################################################################
 
diff --git a/misc/xtsupport.c b/misc/xtsupport.c
index 2f77469135d1a3defb833ada5b63a6f5b817a378..c5c966c1305f897492732662c1dbcf4da46adf5c 100644
--- a/misc/xtsupport.c
+++ b/misc/xtsupport.c
@@ -4,8 +4,8 @@
 
 #include <signal.h>
 #include <stdio.h>
-#include "IntrinsicP.h"
-#include "CoreP.h"
+#include <X11/IntrinsicP.h>
+#include <X11/CoreP.h>
 
 #ifdef sparc
 #include "IntrinsicI.h"