Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP
Path: utzoo!mnetor!uunet!husc6!necntc!ames!aurora!labrea!jade!ucbvax!ATHENA.MIT.EDU!swick
From: swick@ATHENA.MIT.EDU (Ralph R. Swick)
Newsgroups: comp.windows.x
Subject: X.V11R1 - bitten by a last-minute change
Message-ID: <8709161834.AA04096@LYRE.MIT.EDU>
Date: Wed, 16-Sep-87 14:34:08 EDT
Article-I.D.: LYRE.8709161834.AA04096
Posted: Wed Sep 16 14:34:08 1987
Date-Received: Sat, 19-Sep-87 11:59:00 EDT
Sender: daemon@ucbvax.BERKELEY.EDU
Organization: The ARPA Internet
Lines: 125

Bob and I (without Todd watching - we should have known!) made a
last-minute change to the Sun Makefiles to install a program that
restores the keyboard state after X exists.  We goofed...  The Sun
ddx library won't get built with the correct modules in it until
you apply the following patches:

To server/ddx/sun/Imakefile (if you use Imake) and/or to
server/ddx/sun/Makefile:

*** X.V11R1/server/ddx/sun/Makefile
--- Imakefile:
***************
*** 11,17 ****
  	sunCG2C.c \
  	sunCG2M.c \
  	sunCG4C.c \
! 	sunKeyMap.c
  
  OFILES = sunInit.o
  
--- 11,18 ----
  	sunCG2C.c \
  	sunCG2M.c \
  	sunCG4C.c \
! 	sunKeyMap.c \
! 	kbd_mode.c
  
  OFILES = sunInit.o
  
***************
*** 38,44 ****
  all:: $(OFILES) kbd_mode
  
  NormalLibraryTarget(sun,$(OBJS))
! SimpleProgramTarget(kbd_mode)
  DependTarget()
  InstallManPage(Xsun,$(MANDIR))
  
--- 39,47 ----
  all:: $(OFILES) kbd_mode
  
  NormalLibraryTarget(sun,$(OBJS))
! SingleProgramTarget(kbd_mode, kbd_mode.o,,)
! InstallProgram(kbd_mode,$(BINDIR))
! InstallManPage(kbd_mode,$(MANDIR))
  DependTarget()
  InstallManPage(Xsun,$(MANDIR))
  

*** X.V11R1/server/ddx/sun/Makefile
--- Makefile
***************
*** 80,86 ****
  	sunCG2C.c \
  	sunCG2M.c \
  	sunCG4C.c \
! 	sunKeyMap.c
  
  OFILES = sunInit.o
  
--- 80,87 ----
  	sunCG2C.c \
  	sunCG2M.c \
  	sunCG4C.c \
! 	sunKeyMap.c \
! 	kbd_mode.c
  
  OFILES = sunInit.o
  
***************
*** 114,144 ****
  	ar clq $@ $(OBJS)
  	ranlib $@
  
!            OBJS = kbd_mode.o
!            SRCS = kbd_mode.c
! 
!         PROGRAM = kbd_mode
! 
! all:: kbd_mode
! 
! kbd_mode: $(OBJS) $(LOCAL_LIBRARIES)
  	rm -f $@
! 	$(CC) -o $@ $(OBJS) $(LOCAL_LIBRARIES) $(LDFLAGS)
  
! relink:
! 	rm -f $(PROGRAM)
! 	$(MAKE) $(MFLAGS) $(PROGRAM)
  
  install:: kbd_mode
  	$(INSTALL) -c $(INSTALLFLAGS) kbd_mode $(BINDIR)
  
  install:: kbd_mode.man
  	$(INSTALL) -c -m 0664 kbd_mode.man $(MANDIR)/kbd_mode.n
- 
- depend::
- 	$(DEPEND) -s "# DO NOT DELETE" $(CFLAGS) $(SRCS)
- clean::
- 	rm -f $(PROGRAM)
  
  depend::
  	$(DEPEND) -s "# DO NOT DELETE" $(CFLAGS) $(SRCS)
--- 115,136 ----
  	ar clq $@ $(OBJS)
  	ranlib $@
  
! kbd_mode:  kbd_mode.o
  	rm -f $@
! 	$(CC) -o $@  kbd_mode.o  $(LDFLAGS)
  
! relink::
! 	rm -f kbd_mode
! 	$(MAKE) $(MFLAGS) kbd_mode
  
+ clean::
+ 	rm -f kbd_mode
+ 
  install:: kbd_mode
  	$(INSTALL) -c $(INSTALLFLAGS) kbd_mode $(BINDIR)
  
  install:: kbd_mode.man
  	$(INSTALL) -c -m 0664 kbd_mode.man $(MANDIR)/kbd_mode.n
  
  depend::
  	$(DEPEND) -s "# DO NOT DELETE" $(CFLAGS) $(SRCS)