Patch #: 11 Type: bug fix Priority: medium Affects: sites requiring non-standard source locations etc. Reported: Hitoshi AIDA Reported: Rakesh Patel Reported: Gilbert Taylor-Wood Reported: JQ Johnson Archived: munnari.OZ.AU mac/cap.patches/cap60.patch011 Summary: hard-coded filenames, abetalk.o not deleted at cleanup File: cap60/Configure File: cap60/lib/cap/Makefile.m4 File: cap60/support/uab/Makefile.m4 *** Configure.orig Wed May 8 02:20:46 1991 --- Configure Wed May 8 03:33:17 1991 *************** *** 1,7 **** #!/bin/sh ! # $Author: djh $ $Date: 91/03/13 19:31:17 $ ! # $Header: Configure,v 2.2 91/03/13 19:31:17 djh Exp $ ! # $Revision: 2.2 $ # CAP configuration shell script. This ain't perfect, but it's a start. # Execute with /bin/sh Configure if your system won't run it (ksh is okay too) # --- 1,7 ---- #!/bin/sh ! # $Author: djh $ $Date: 1991/05/07 17:32:55 $ ! # $Header: /mac/src/cap60/RCS/Configure,v 2.3 1991/05/07 17:32:55 djh Exp djh $ ! # $Revision: 2.3 $ # CAP configuration shell script. This ain't perfect, but it's a start. # Execute with /bin/sh Configure if your system won't run it (ksh is okay too) # *************** *** 756,761 **** --- 756,762 ---- # MINOR CONFIGURATION: configure various programs #define([columbia],1) # so columbia can do things quickly + #define([rutgers],1) # so rutgers can do things quickly #define([debug],1) # testing things (without disrupting) # location of include files *************** *** 771,776 **** --- 772,778 ---- define([capsrvrdestdir],[[/usr/local/cap]]) # location of some cap data files define([caplibdestdir],[[/usr/local/lib/cap]]) + ifdef([rutgers],[define([caplibdestdir],[[/usr/local/cap/lib]])]) # location of cap libraries define([libdestdir],[[/usr/local/lib]]) # override for aux (doesn't search /usr/local/lib) *************** *** 842,848 **** # # lwrename: set name of file containing list of printers to be renamed # ! define([lwrenamefile],[[\"/usr/local/lib/cap/lwrename.list\"]]) # # papif: see applications/papif/README --- 844,850 ---- # # lwrename: set name of file containing list of printers to be renamed # ! define([lwrenamefile],concat([\"],caplibdestdir,[/lwrename.list\"])) # # papif: see applications/papif/README *************** *** 893,899 **** # for cap.printers - uncomment and change the following line to point # papif, et. al. to a location other than /etc/cap.printers. (Note: ! # line below would set it to $etcdir/cap.printers) # define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"])) ifdef([columbia], [define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))]) --- 895,901 ---- # for cap.printers - uncomment and change the following line to point # papif, et. al. to a location other than /etc/cap.printers. (Note: ! # line below would set it to $etcdest/cap.printers) # define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"])) ifdef([columbia], [define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))]) *************** *** 901,906 **** --- 903,909 ---- # (probably shouldn't). Remember that atalk.local is expected to # be in etcdest define([atalklocal],concat([\"],etcdest,[/],[atalk.local],[\"])) + define([etalklocal],concat([\"],etcdest,[/],[etalk.local],[\"])) define([configdir],concat([\"],etcdest,[\"])) # in case you want to globally change the c compiler *************** *** 1050,1055 **** --- 1053,1059 ---- define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"])) define([cflags],concat(cflags,[ -I],includedir)) define([atalklocal],concat([\"],etcdest,[/],[atalk.local],[\"])) + define([etalklocal],concat([\"],etcdest,[/],[etalk.local],[\"])) define([configdir],concat([\"],etcdest,[\"])) ]) *** lib/cap/Makefile.m4.orig Wed May 8 03:38:20 1991 --- lib/cap/Makefile.m4 Wed May 8 04:03:49 1991 *************** *** 48,54 **** abetalk.o: (cd ../../support/ethertalk; make abetalk.o) ! cp ../../support/ethertalk/abetalk.o abetalk.o abmkip.o: abkip.c ${DEPENDS} $I/netat/abnbp.h $I/netat/compat.h cp abkip.c abmkip.c --- 48,54 ---- abetalk.o: (cd ../../support/ethertalk; make abetalk.o) ! mv ../../support/ethertalk/abetalk.o abetalk.o abmkip.o: abkip.c ${DEPENDS} $I/netat/abnbp.h $I/netat/compat.h cp abkip.c abmkip.c *************** *** 56,62 **** /bin/rm abmkip.c atalkdbm.o: atalkdbm.c ${DEPENDS} ! ${CC} ${CFLAGS} -DTAB=atalklocal() -DCONFIGDIR=configdir() -c atalkdbm.c authenticate.o: authenticate.c ${DEPENDS} ${CC} ${CFLAGS} -DAUTHCONFIG=${AUTHCONFIG} -c authenticate.c --- 56,63 ---- /bin/rm abmkip.c atalkdbm.o: atalkdbm.c ${DEPENDS} ! ${CC} ${CFLAGS} -DTAB=atalklocal() -DETAB=etalklocal() \ ! -DCONFIGDIR=configdir() -c atalkdbm.c authenticate.o: authenticate.c ${DEPENDS} ${CC} ${CFLAGS} -DAUTHCONFIG=${AUTHCONFIG} -c authenticate.c *** support/uab/Makefile.m4.orig Wed May 8 03:40:33 1991 --- support/uab/Makefile.m4 Wed May 8 03:43:18 1991 *************** *** 25,31 **** [${INSTALLER} uab ${DESTDIR}]) kip_mpx.o: kip_mpx.c mpxddp.h gw.h node.h ddpport.h ! cc -c ${CFLAGS} kip_mpx.c uab.o: uab.c mpxddp.h gw.h node.h ddpport.h if_desc.h cc -c ${CFLAGS} -DUAB_PIDFILE=\"/usr/local/lib/cap/uab.pid\" \ --- 25,31 ---- [${INSTALLER} uab ${DESTDIR}]) kip_mpx.o: kip_mpx.c mpxddp.h gw.h node.h ddpport.h ! cc -c ${CFLAGS} -DTAB=etalklocal() -DMTAB=etalklocal() kip_mpx.c uab.o: uab.c mpxddp.h gw.h node.h ddpport.h if_desc.h cc -c ${CFLAGS} -DUAB_PIDFILE=\"/usr/local/lib/cap/uab.pid\" \ *** README.orig Wed May 8 20:54:23 1991 --- README Wed May 8 20:54:36 1991 *************** *** 3,9 **** (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 10, May 1991 Introduction ------------ --- 3,9 ---- (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 11, May 1991 Introduction ------------