diff --minimal -c --new-file olvwm4-patch1/Imakefile olvwm4-patch1-Linux/Imakefile
*** olvwm4-patch1/Imakefile	Sun Apr 23 16:15:35 1995
--- olvwm4-patch1-Linux/Imakefile	Sun Apr 23 15:53:55 1995
***************
*** 48,54 ****
  /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
  
  /**/# For a generic Solaris 2.x system, I'd suggest
! MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
  
  /**/#
  /**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
--- 48,54 ----
  /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
  
  /**/# For a generic Solaris 2.x system, I'd suggest
! MORECCFLAGS=-I/usr/X11R6/include/X11 -I/usr/include/bsd -include /usr/include/bsd/bsd.h -DOW_I18N_L3 -DIDENT -DXPM -DSHAPE -DXLIB_ILLEGAL_ACCESS -DMAXPID=32768 
  
  /**/#
  /**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
***************
*** 57,63 ****
  /**/#MORELDFLAGS=-L${OPENWINHOME}/lib
  /**/#
  /**/# For Solaris 2.x, I'd suggest
! MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
  
  
  /**/# No more changes needed
--- 57,63 ----
  /**/#MORELDFLAGS=-L${OPENWINHOME}/lib
  /**/#
  /**/# For Solaris 2.x, I'd suggest
! MORELDFLAGS=-lbsd -lXpm
  
  
  /**/# No more changes needed
***************
*** 69,75 ****
  /**/# Imakefile for olwm release 3.0.
  
  DEFINES =  $(MORECCFLAGS)
! SYS_LIBRARIES = -ll -lm
  INCLUDES = -I$(HEADER_DEST) -I$(TOP) $(XPMINCDIR) 
  DEPLIBS = 
  LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
--- 69,75 ----
  /**/# Imakefile for olwm release 3.0.
  
  DEFINES =  $(MORECCFLAGS)
! SYS_LIBRARIES = -lm -lfl
  INCLUDES = -I$(HEADER_DEST) -I$(TOP) $(XPMINCDIR) 
  DEPLIBS = 
  LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
diff --minimal -c --new-file olvwm4-patch1/defaults.c olvwm4-patch1-Linux/defaults.c
*** olvwm4-patch1/defaults.c	Thu Jan 13 13:36:03 1994
--- olvwm4-patch1-Linux/defaults.c	Sun Apr 23 12:37:11 1995
***************
*** 90,96 ****
  #ifdef SVR4
  	    if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) {
  #else
! 	    if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
  #endif
  		(void) strcat(filename, hostname);
  		fileDB = XrmGetFileDatabase(filename);
--- 90,96 ----
  #ifdef SVR4
  	    if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) {
  #else
! 	    if (0 == gethostname(hostname, sizeof(hostname) /*, &namelen */)) {
  #endif
  		(void) strcat(filename, hostname);
  		fileDB = XrmGetFileDatabase(filename);
diff --minimal -c --new-file olvwm4-patch1/services.c olvwm4-patch1-Linux/services.c
*** olvwm4-patch1/services.c	Thu Jan 13 13:36:17 1994
--- olvwm4-patch1-Linux/services.c	Sun Apr 23 14:44:22 1995
***************
*** 83,91 ****
      } else if (pid == 0) {
  	/* child */
  #ifdef SYSV
! 	setpgrp();
  #else
! 	setpgrp(0, getpid());
  #endif
  	execve(args[0], args, env);
  	perror("olvwm: exec");
--- 83,91 ----
      } else if (pid == 0) {
  	/* child */
  #ifdef SYSV
! 	setpgid();
  #else
! 	setpgid(0, getpid());
  #endif
  	execve(args[0], args, env);
  	perror("olvwm: exec");
***************
*** 232,240 ****
  		close( 1 );		/* close stdout */
  		dup( 2 );		/* make olwm stderr = psh stdout */
  #ifdef SYSV
! 		setpgrp();
  #else
! 		setpgrp(0, getpid());
  #endif
  		execve( commArgv[0], commArgv, env );
  		fprintf( stderr, GetString("olvwm: psh error: %d\n"), errno );
--- 232,240 ----
  		close( 1 );		/* close stdout */
  		dup( 2 );		/* make olwm stderr = psh stdout */
  #ifdef SYSV
! 		setpgid();
  #else
! 		setpgid(0, getpid());
  #endif
  		execve( commArgv[0], commArgv, env );
  		fprintf( stderr, GetString("olvwm: psh error: %d\n"), errno );