Subject: tn3270 Makefile bugs
To: None <current-users@sun-lamp.cs.berkeley.edu>
From: Roland McGrath <roland@frob.com>
List: current-users
Date: 01/21/1994 18:49:00
If /usr/bin/make is not first in your path, makes in tn3270 always bomb.
This fixes it.

diff -c /usr/src/usr.bin/tn3270/tn3270/Makefile.\~1\~ /usr/src/usr.bin/tn3270/tn3270/Makefile
*** /usr/src/usr.bin/tn3270/tn3270/Makefile.~1~	Tue Dec 28 07:40:58 1993
--- /usr/src/usr.bin/tn3270/tn3270/Makefile	Fri Jan 21 18:48:01 1994
***************
*** 31,46 ****
  PROG = tn3270
  
  MKASTOSC!=cd $(.CURDIR)/../tools/mkastosc; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkastosc\n" | make -r -s -f - xxx
  
  MKASTODS!=cd $(.CURDIR)/../tools/mkastods; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkastods\n" | make -r -s -f - xxx
  
  MKDSTOAS!=cd $(.CURDIR)/../tools/mkdstoas; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkdstoas\n" | make -r -s -f - xxx
  
  MKHITS!=cd $(.CURDIR)/../tools/mkhits; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkhits\n" | make -r -s -f - xxx
  
  astosc.o: astosc.OUT
  CLEANFILES += astosc.OUT astosc.out
--- 31,46 ----
  PROG = tn3270
  
  MKASTOSC!=cd $(.CURDIR)/../tools/mkastosc; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkastosc\n" | ${MAKE} -r -s -f - xxx
  
  MKASTODS!=cd $(.CURDIR)/../tools/mkastods; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkastods\n" | ${MAKE} -r -s -f - xxx
  
  MKDSTOAS!=cd $(.CURDIR)/../tools/mkdstoas; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkdstoas\n" | ${MAKE} -r -s -f - xxx
  
  MKHITS!=cd $(.CURDIR)/../tools/mkhits; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkhits\n" | ${MAKE} -r -s -f - xxx
  
  astosc.o: astosc.OUT
  CLEANFILES += astosc.OUT astosc.out
***************
*** 79,91 ****
  # kbd.out
  
  ${MKASTOSC}:
! 	cd ${.CURDIR}/../tools/mkastosc; make
  ${MKASTODS}:
! 	cd ${.CURDIR}/../tools/mkastods; make
  ${MKDSTOAS}:
! 	cd ${.CURDIR}/../tools/mkdstoas; make
  ${MKHITS}:
! 	cd ${.CURDIR}/../tools/mkhits; make
  
  
  depend: .depend
--- 79,91 ----
  # kbd.out
  
  ${MKASTOSC}:
! 	cd ${.CURDIR}/../tools/mkastosc; ${MAKE}
  ${MKASTODS}:
! 	cd ${.CURDIR}/../tools/mkastods; ${MAKE}
  ${MKDSTOAS}:
! 	cd ${.CURDIR}/../tools/mkdstoas; ${MAKE}
  ${MKHITS}:
! 	cd ${.CURDIR}/../tools/mkhits; ${MAKE}
  
  
  depend: .depend

Diff exited abnormally with code 1 at Fri Jan 21 18:48:36

diff -c /usr/src/usr.bin/tn3270/mset/Makefile.\~1\~ /usr/src/usr.bin/tn3270/mset/Makefile
*** /usr/src/usr.bin/tn3270/mset/Makefile.~1~	Tue Dec 28 07:40:47 1993
--- /usr/src/usr.bin/tn3270/mset/Makefile	Fri Jan 21 18:47:54 1994
***************
*** 17,23 ****
  PROG = mset
  
  MKASTOSC!=cd $(.CURDIR)/../tools/mkastosc; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkastosc\n" | make -r -s -f - xxx
  
  astosc.o: astosc.OUT
  CLEANFILES += astosc.OUT astosc.out
--- 17,23 ----
  PROG = mset
  
  MKASTOSC!=cd $(.CURDIR)/../tools/mkastosc; \
! 	printf "xxx:\n\techo \$${.OBJDIR}/mkastosc\n" | ${MAKE} -r -s -f - xxx
  
  astosc.o: astosc.OUT
  CLEANFILES += astosc.OUT astosc.out
***************
*** 32,38 ****
  # astosc.out
  
  ${MKASTOSC}:
! 	cd ${.CURDIR}/../tools/mkastosc; make
  
  
  depend: .depend
--- 32,38 ----
  # astosc.out
  
  ${MKASTOSC}:
! 	cd ${.CURDIR}/../tools/mkastosc; ${MAKE}
  
  
  depend: .depend

Diff exited abnormally with code 1 at Fri Jan 21 18:48:19

------------------------------------------------------------------------------