[5828] in Athena Bugs

home help back first fref pref prev next nref lref last post

lpr changes/bugfixes for pmax/ultrix

daemon@ATHENA.MIT.EDU (John T Kohl)
Fri Aug 24 11:09:49 1990

Date: Fri, 24 Aug 90 11:09:16 -0400
From: John T Kohl <jtkohl@ATHENA.MIT.EDU>
To: bugs@ATHENA.MIT.EDU

The Makefile changes have some directory name and CFLAGS changes in
them, but the name changes are parameterized, so you should pick up the
changes and then put back the MIT/Athena install paths.

*** /tmp/,RCSt1008561	Fri Aug 24 11:05:19 1990
--- lprm.c	Wed Jul 18 04:09:11 1990
***************
*** 65,72 ****
--- 65,76 ----
  	struct hostent *hp;
  
  #ifdef OPERATOR
+ #ifdef LOG_AUTH
  	openlog("lpc", 0, LOG_AUTH);
+ #else
+ 	openlog("lpc", 0);
  #endif
+ #endif
  
  	name = argv[0];
  	gethostname(host, sizeof(host));
***************
*** 73,79 ****
--- 77,89 ----
  	hp = gethostbyname(host);
  	if (hp) strcpy(host, hp -> h_name);
  
+ #ifndef OPERATOR
+ #ifdef LOG_LPR
  	openlog("lpd", 0, LOG_LPR);
+ #else
+ 	openlog("lpd", 0);
+ #endif
+ #endif
  	if ((p = getpwuid(GETUID())) == NULL)
  		fatal("Who are you?");
  	if (strlen(p->pw_name) >= sizeof(luser))
*** /tmp/,RCSt1008561	Fri Aug 24 11:05:22 1990
--- lp.h	Wed Jul 18 03:50:52 1990
***************
*** 27,33 ****
  #include <netinet/in.h>
  #include <netdb.h>
  #include <pwd.h>
! #include <sys/syslog.h>
  #include <signal.h>
  #include <sys/wait.h>
  #include <sgtty.h>
--- 27,33 ----
  #include <netinet/in.h>
  #include <netdb.h>
  #include <pwd.h>
! #include <syslog.h>
  #include <signal.h>
  #include <sys/wait.h>
  #include <sgtty.h>
*** /tmp/,RCSt1008561	Fri Aug 24 11:05:27 1990
--- lpd.c	Mon Jul 23 21:58:31 1990
***************
*** 144,150 ****
--- 144,154 ----
  	}
  #endif
  
+ #ifdef LOG_LPR
  	openlog("lpd", LOG_PID, LOG_LPR);
+ #else
+ 	openlog("lpd", LOG_PID);
+ #endif
  	if (lflag) syslog(LOG_INFO, "daemon started");
  	(void) umask(0);
  	lfd = open(MASTERLOCK, O_WRONLY|O_CREAT, 0644);
***************
*** 669,671 ****
--- 673,747 ----
  	fputs(errno < sys_nerr ? sys_errlist[errno] : "Unknown error" , stdout);
  	putchar('\n');
  }
+ 
+ #ifdef ultrix
+ _validuser(hostf, rhost, luser, ruser, baselen)
+ char *rhost, *luser, *ruser;
+ FILE *hostf;
+ int baselen;
+ {
+ 	char *user;
+ 	char ahost[MAXHOSTNAMELEN];
+ 	register char *p;
+ 
+ 	while (fgets(ahost, sizeof (ahost), hostf)) {
+ 		p = ahost;
+ 		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
+ 			*p = islower(*p) ? toupper(*p) : *p;
+ 			p++;
+ 		}
+ 		if (*p == ' ' || *p == '\t') {
+ 			*p++ = '\0';
+ 			while (*p == ' ' || *p == '\t')
+ 				p++;
+ 			user = p;
+ 			while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0')
+ 				p++;
+ 		} else
+ 			user = p;
+ 		*p = '\0';
+ 		if (_checkhost(rhost, ahost, baselen) &&
+ 		    !strcmp(ruser, *user ? user : luser)) {
+ 			return (0);
+ 		}
+ 	}
+ 	return (-1);
+ }
+ 
+ _checkhost(rhost, lhost, len)
+ char *rhost, *lhost;
+ int len;
+ {
+ 	static char ldomain[MAXHOSTNAMELEN + 1];
+ 	static char *domainp = NULL;
+ 	static int nodomain = 0;
+ 	register char *cp;
+ 
+ 	if (len == -1)
+ 		return(!strcmp(rhost, lhost));
+ 	if (strncmp(rhost, lhost, len))
+ 		return(0);
+ 	if (!strcmp(rhost, lhost))
+ 		return(1);
+ 	if (*(lhost + len) != '\0')
+ 		return(0);
+ 	if (nodomain)
+ 		return(0);
+ 	if (!domainp) {
+ 		if (gethostname(ldomain, sizeof(ldomain)) == -1) {
+ 			nodomain = 1;
+ 			return(0);
+ 		}
+ 		ldomain[MAXHOSTNAMELEN] = NULL;
+ 		if ((domainp = index(ldomain, '.')) == (char *)NULL) {
+ 			nodomain = 1;
+ 			return(0);
+ 		}
+ 		for (cp = ++domainp; *cp; ++cp)
+ 			if (islower(*cp))
+ 				*cp = toupper(*cp);
+ 	}
+ 	return(!strcmp(domainp, rhost + len +1));
+ 
+ }
+ #endif
*** /tmp/,RCSt1008561	Fri Aug 24 11:05:31 1990
--- lpc.c	Wed Aug  1 03:25:06 1990
***************
*** 65,74 ****
--- 65,82 ----
  
  	name = argv[0];
  #ifdef OPERATOR
+ #ifdef  LOG_AUTH
  	openlog("lpc", 0, LOG_AUTH);
  #else
+ 	openlog("lpc", 0);
+ #endif
+ #else
+ #ifdef  LOG_LPR
  	openlog("lpd", 0, LOG_LPR);
+ #else
+ 	openlog("lpd", 0);
  #endif
+ #endif
  	if (--argc > 0) {
  		c = getcmd(*++argv);
  		if (c == (struct cmd *)-1) {
***************
*** 221,227 ****
  
  		printf("Commands may be abbreviated.  Commands are:\n\n");
  		for (c = cmdtab; c < &cmdtab[NCMDS]; c++) {
! 			int len = strlen(c->c_name);
  
  			if (len > width)
  				width = len;
--- 229,238 ----
  
  		printf("Commands may be abbreviated.  Commands are:\n\n");
  		for (c = cmdtab; c < &cmdtab[NCMDS]; c++) {
! 			int len;
! 			if (!c->c_name)
! 			    continue;
! 			len = strlen(c->c_name);
  
  			if (len > width)
  				width = len;
***************
*** 277,283 ****
  	name = pwentry->pw_name; /* get his name */
  
  	sprintf(logbuf,"%s LPC: ",name);
! 	for (i=0 ;i <= argc; i++) {
  		strcat(logbuf,argv[i]);
  		strcat(logbuf," ");
  	}
--- 288,294 ----
  	name = pwentry->pw_name; /* get his name */
  
  	sprintf(logbuf,"%s LPC: ",name);
! 	for (i=0 ;i < argc; i++) {
  		strcat(logbuf,argv[i]);
  		strcat(logbuf," ");
  	}
*** /tmp/,RCSt1008561	Fri Aug 24 11:05:35 1990
--- printjob.c	Wed Jul 18 04:09:27 1990
***************
*** 102,108 ****
  char	pxlength[10] = "-y";	/* page length in pixels */
  char	indent[10] = "-i0";	/* indentation size in characters */
  char	cost[10] = "-m";		/* Cost/page option */
! char	tmpfile[] = "errsXXXXXX"; /* file name for filter output */
  int 	lflag;			/* Log info flag */
  
  printjob()
--- 102,108 ----
  char	pxlength[10] = "-y";	/* page length in pixels */
  char	indent[10] = "-i0";	/* indentation size in characters */
  char	cost[10] = "-m";		/* Cost/page option */
! char	tmpfileX[] = "errsXXXXXX"; /* file name for filter output */
  int 	lflag;			/* Log info flag */
  
  printjob()
***************
*** 126,132 ****
  	 signal(SIGQUIT, abortpr);
  	 signal(SIGTERM, abortpr);
  
! 	 (void) mktemp(tmpfile);
  
  	 /*
  	  * uses short form file names
--- 126,132 ----
  	 signal(SIGQUIT, abortpr);
  	 signal(SIGTERM, abortpr);
  
! 	 (void) mktemp(tmpfileX);
  
  	 /*
  	  * uses short form file names
***************
*** 256,262 ****
  			if (TR != NULL)		/* output trailer */
  				(void) write(ofd, TR, strlen(TR));
  		}
! 		(void) UNLINK(tmpfile);
  		exit(0);
  	}
  	goto again;
--- 256,262 ----
  			if (TR != NULL)		/* output trailer */
  				(void) write(ofd, TR, strlen(TR));
  		}
! 		(void) UNLINK(tmpfileX);
  		exit(0);
  	}
  	goto again;
***************
*** 679,685 ****
  	if ((child = dofork(DORETURN)) == 0) {	/* child */
  		dup2(fi, 0);
  		dup2(fo, 1);
! 		n = open(tmpfile, O_WRONLY|O_CREAT|O_TRUNC, 0664);
  		if (n >= 0)
  			dup2(n, 2);
  		for (n = 3; n < NOFILE; n++)
--- 679,685 ----
  	if ((child = dofork(DORETURN)) == 0) {	/* child */
  		dup2(fi, 0);
  		dup2(fo, 1);
! 		n = open(tmpfileX, O_WRONLY|O_CREAT|O_TRUNC, 0664);
  		if (n >= 0)
  			dup2(n, 2);
  		for (n = 3; n < NOFILE; n++)
***************
*** 1082,1089 ****
  			printf("\ncould not be printed without an account on %s\n", host);
  			break;
  		case FILTERERR:
! 			if (stat(tmpfile, &stb) < 0 || stb.st_size == 0 ||
! 			    (fp = fopen(tmpfile, "r")) == NULL) {
  				printf("\nwas printed but had some errors\n");
  				break;
  			}
--- 1082,1089 ----
  			printf("\ncould not be printed without an account on %s\n", host);
  			break;
  		case FILTERERR:
! 			if (stat(tmpfileX, &stb) < 0 || stb.st_size == 0 ||
! 			    (fp = fopen(tmpfileX, "r")) == NULL) {
  				printf("\nwas printed but had some errors\n");
  				break;
  			}
***************
*** 1186,1192 ****
  	/* Drop lock on lock file as well */
  	if (lfd > 0)
  		(void) close(lfd);
! 	(void) UNLINK(tmpfile);
  	kill(0, SIGINT);
  	if (ofilter > 0)
  		kill(ofilter, SIGCONT);
--- 1186,1192 ----
  	/* Drop lock on lock file as well */
  	if (lfd > 0)
  		(void) close(lfd);
! 	(void) UNLINK(tmpfileX);
  	kill(0, SIGINT);
  	if (ofilter > 0)
  		kill(ofilter, SIGCONT);
***************
*** 1241,1249 ****
--- 1241,1251 ----
  	if ((PL = pgetnum("pl")) < 0)
  		PL = DEFLENGTH;
  	sprintf(&length[2], "%d", PL);
+ #ifdef PQUOTA
  	if ((CP = pgetnum("pc")) < 0)
  	        CP = DEFPC;
  	sprintf(&cost[2], "%d", CP);
+ #endif
  	if ((PX = pgetnum("px")) < 0)
  		PX = 0;
  	sprintf(&pxwidth[2], "%d", PX);
*** /tmp/,RCSt1008561	Fri Aug 24 11:05:38 1990
--- lpq.c	Wed Jul 18 04:09:03 1990
***************
*** 65,72 ****
  	name = argv[0];
  	gethostname(host, sizeof(host));
  	if (hp = gethostbyname(host)) strcpy(host, hp -> h_name);
  	openlog("lpd", 0, LOG_LPR);
! 
  	while (--argc) {
  		if ((arg = *++argv)[0] == '+') {
  			if (arg[1] != '\0')
--- 65,75 ----
  	name = argv[0];
  	gethostname(host, sizeof(host));
  	if (hp = gethostbyname(host)) strcpy(host, hp -> h_name);
+ #ifdef LOG_LPR
  	openlog("lpd", 0, LOG_LPR);
! #else
! 	openlog("lpd", 0);
! #endif
  	while (--argc) {
  		if ((arg = *++argv)[0] == '+') {
  			if (arg[1] != '\0')
*** /tmp/,RCSt1008561	Fri Aug 24 11:05:43 1990
--- lpr.c	Wed Aug  1 00:35:16 1990
***************
*** 173,179 ****
--- 173,183 ----
  #else SERVER
  	if (hp = gethostbyname(host)) strcpy(host, hp -> h_name);
  #endif SERVER
+ #ifdef LOG_LPR
  	openlog("lpd", 0, LOG_LPR);
+ #else
+ 	openlog("lpd", 0);
+ #endif
  
  	while (argc > 1 && argv[1][0] == '-') {
  		argc--;
***************
*** 674,680 ****
--- 678,686 ----
  test(file)
  	char *file;
  {
+ #ifndef mips
  	struct exec execb;
+ #endif
  	register int fd;
  	register char *cp;
  
***************
*** 700,705 ****
--- 706,712 ----
  		printf("%s: cannot open %s\n", name, file);
  		return(-1);
  	}
+ #ifndef mips
  	if (read(fd, &execb, sizeof(execb)) == sizeof(execb))
  		switch((int) execb.a_magic) {
  		case A_MAGIC1:
***************
*** 714,719 ****
--- 721,727 ----
  			printf("%s: %s is an archive file", name, file);
  			goto error1;
  		}
+ #endif
  	(void) close(fd);
  	if (rflag) {
  		if ((cp = rindex(file, '/')) == NULL) {
*** /tmp/,RCSt1008561	Fri Aug 24 11:05:47 1990
--- Makefile	Mon Jul 23 21:57:57 1990
***************
*** 19,28 ****
  #
  DESTDIR=
  
! CFLAGS=-O -DVFS -DHESIOD -DKERBEROS -DZEPHYR -DPQUOTA -Iquota
! LIBS= -lhesiod -lzephyr -lcom_err -lkrb -ldes
  LIBDIR=/usr/lib
! BINDIR=/usr/ucb
  SPOOLDIR=/usr/spool/lpd
  CXREF=/usr/ucb/ctags -x
  ROOT=root
--- 19,29 ----
  #
  DESTDIR=
  
! CFLAGS=-O -DVFS -DHESIOD -DKERBEROS -DZEPHYR -I/usr/athena/include
! LIBS= -L/usr/athena/lib -lhesiod -lzephyr -lcom_err -lkrb #-ldes
  LIBDIR=/usr/lib
! BINDIR=/usr/athena/bin
! ETCDIR=/usr/athena/etc
  SPOOLDIR=/usr/spool/lpd
  CXREF=/usr/ucb/ctags -x
  ROOT=root
***************
*** 37,43 ****
  	startdaemon.c common.c printcap.c lpdchar.c
  ALL=	lpd lpc lptest pac o_lprm o_lpc lpr lpq lprm s_lpq s_lprm s_lpr 
  
! SUBDIR=quota transcript-v2.1 man
  all:	${ALL} FILTERS ${SUBDIR}
  
  ${SUBDIR}: FRC
--- 38,45 ----
  	startdaemon.c common.c printcap.c lpdchar.c
  ALL=	lpd lpc lptest pac o_lprm o_lpc lpr lpq lprm s_lpq s_lprm s_lpr 
  
! #SUBDIR=quota transcript-v2.1 man
! SUBDIR=man
  all:	${ALL} FILTERS ${SUBDIR}
  
  ${SUBDIR}: FRC
***************
*** 142,166 ****
  install:
  	-for i in lpr lpq lprm; do \
  		install -c -s -o root -g ${SPGRP} -m 6755 $$i \
! 			${DESTDIR}/${BINDIR}/$$i; \
  	done
! 	-rm -f $(DESTDIR)/$(BINDIR)/lpr.ucb
! 	-ln -s lpr ${DESTDIR}/${BINDIR}/lpr.ucb
  	-for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install; cd ..); \
  		done
! 	-install -c print.sh ${DESTDIR}/usr/ucb/print
! 	-install -c -s -g ${SPGRP} -m 2755 lpc ${DESTDIR}/usr/etc/
! 	-install -c -s -o root -g ${SPGRP} -m 6755 lpd ${DESTDIR}/${LIBDIR}/
! 	-install -c -s -o root -g ${SPGRP} -m 6755 s_lpr ${DESTDIR}/${BINDIR}/
! 	-install -c -s -o root -g ${SPGRP} -m 6755 s_lpq ${DESTDIR}/${BINDIR}/
! 	-install -c -s -o root -g ${SPGRP} -m 6755 s_lprm ${DESTDIR}/${BINDIR}/
! 	-install -s pac ${DESTDIR}/usr/etc/pac
! 	-install -c print.sh ${DESTDIR}/usr/ucb/print
! 	-install -c -m 755 makespools ${DESTDIR}/etc
! 	-install -c -s -o root -g ${OP_GID} -m 6754 o_lprm ${DESTDIR}/usr/etc/
! 	-install -c -s -o root -g ${OP_GID} -m 6754 o_lpc ${DESTDIR}/usr/etc/
! 	-install -s pac ${DESTDIR}/usr/etc/pac
  	@echo  To build spooling directories:
  	@echo makespools ${DESTDIR} 775 ${DAEMON} ${SPGRP}
  	cd filters; make ${MFLAGS} DESTDIR=${DESTDIR} install
--- 144,166 ----
  install:
  	-for i in lpr lpq lprm; do \
  		install -c -s -o root -g ${SPGRP} -m 6755 $$i \
! 			${DESTDIR}${BINDIR}/$$i; \
  	done
! #	-rm -f $(DESTDIR)/$(BINDIR)/lpr.ucb
! #	-ln -s lpr ${DESTDIR}${BINDIR}/lpr.ucb
  	-for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install; cd ..); \
  		done
! 	-install -c -s -g ${SPGRP} -m 2755 lpc ${DESTDIR}$(ETCDIR)/lpc
! 	-install -c -s -o root -g ${SPGRP} -m 6755 lpd ${DESTDIR}${LIBDIR}/
! 	-install -c -s -o root -g ${SPGRP} -m 6755 s_lpr ${DESTDIR}${BINDIR}/
! 	-install -c -s -o root -g ${SPGRP} -m 6755 s_lpq ${DESTDIR}${BINDIR}/
! 	-install -c -s -o root -g ${SPGRP} -m 6755 s_lprm ${DESTDIR}${BINDIR}/
! 	-install -c -s pac ${DESTDIR}$(ETCDIR)/pac
! #	-install -c print.sh ${DESTDIR}$(BINDIR)/print
! 	-install -c -m 755 makespools ${DESTDIR}$(ETCDIR)/makespools
! 	-install -c -s -o root -g ${OP_GID} -m 6754 o_lprm ${DESTDIR}$(ETCDIR)/
! 	-install -c -s -o root -g ${OP_GID} -m 6754 o_lpc ${DESTDIR}$(ETCDIR)/
  	@echo  To build spooling directories:
  	@echo makespools ${DESTDIR} 775 ${DAEMON} ${SPGRP}
  	cd filters; make ${MFLAGS} DESTDIR=${DESTDIR} install
***************
*** 167,193 ****
  
  install_old:
  #	install -c -m 444 printcap ${DESTDIR}/etc/printcap
! 	install -c -s -o root -g ${SPGRP} -m 6755 lpd ${DESTDIR}/${LIBDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 lpr ${DESTDIR}/${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 lpq ${DESTDIR}/${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 lprm ${DESTDIR}/${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 s_lpr ${DESTDIR}/${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 s_lpq ${DESTDIR}/${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 s_lprm ${DESTDIR}/${BINDIR}/
! 	install -c -s -g ${SPGRP} -m 2755 lpc ${DESTDIR}/usr/etc/
! 	install -c -s -o root -g ${OP_GID} -m 6754 o_lprm ${DESTDIR}/usr/etc/
! 	install -c -s -o root -g ${OP_GID} -m 6754 o_lpc ${DESTDIR}/usr/etc/
! #	install -s lptest ${DESTDIR}/${BINDIR}/lptest
! 	install -s pac ${DESTDIR}/usr/etc/pac
! 	install -c print.sh ${DESTDIR}/usr/ucb/print
  	install -c -m 755 makespools ${DESTDIR}/etc
  
  	@echo  To build spooling directories:
  	@echo makespools ${DESTDIR} 775 ${DAEMON} ${SPGRP}
  
! #	chown ${DAEMON} ${DESTDIR}/${SPOOLDIR}
! #	chgrp ${SPGRP} ${DESTDIR}/${SPOOLDIR}
! #	chmod 775 ${DESTDIR}/${SPOOLDIR}
  	cd filters; make ${MFLAGS} DESTDIR=${DESTDIR} install
  
  clean:
--- 167,193 ----
  
  install_old:
  #	install -c -m 444 printcap ${DESTDIR}/etc/printcap
! 	install -c -s -o root -g ${SPGRP} -m 6755 lpd ${DESTDIR}${LIBDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 lpr ${DESTDIR}${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 lpq ${DESTDIR}${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 lprm ${DESTDIR}${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 s_lpr ${DESTDIR}${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 s_lpq ${DESTDIR}${BINDIR}/
! 	install -c -s -o root -g ${SPGRP} -m 6755 s_lprm ${DESTDIR}${BINDIR}/
! 	install -c -s -g ${SPGRP} -m 2755 lpc ${DESTDIR}$(ETCDIR)/
! 	install -c -s -o root -g ${OP_GID} -m 6754 o_lprm ${DESTDIR}$(ETCDIR)/
! 	install -c -s -o root -g ${OP_GID} -m 6754 o_lpc ${DESTDIR}$(ETCDIR)/
! #	install -s lptest ${DESTDIR}${BINDIR}/lptest
! 	install -s pac ${DESTDIR}$(ETCDIR)/pac
! 	install -c print.sh ${DESTDIR}$(BINDIR)/print
  	install -c -m 755 makespools ${DESTDIR}/etc
  
  	@echo  To build spooling directories:
  	@echo makespools ${DESTDIR} 775 ${DAEMON} ${SPGRP}
  
! #	chown ${DAEMON} ${DESTDIR}${SPOOLDIR}
! #	chgrp ${SPGRP} ${DESTDIR}${SPOOLDIR}
! #	chmod 775 ${DESTDIR}${SPOOLDIR}
  	cd filters; make ${MFLAGS} DESTDIR=${DESTDIR} install
  
  clean:
*** /tmp/,RCSt1008599	Fri Aug 24 11:06:13 1990
--- filters/Makefile	Mon Jul 23 22:49:05 1990
***************
*** 11,17 ****
  
  DESTDIR=
  CFLAGS=	-O
! LIBDIR=	usr/lib/lpdfilters
  CXREF=	/usr/ucb/ctags -x
  SRCS=	lpf.c necf.c \
  	chrtab.c rvsort.c rvcat.c vsort.c vcat.c vpf.c vpsf.c vdmp.c vpltdmp.c \
--- 11,17 ----
  
  DESTDIR=
  CFLAGS=	-O
! LIBDIR=	/usr/athena/lib/lpdfilters
  CXREF=	/usr/ucb/ctags -x
  SRCS=	lpf.c necf.c \
  	chrtab.c rvsort.c rvcat.c vsort.c vcat.c vpf.c vpsf.c vdmp.c vpltdmp.c \
***************
*** 29,59 ****
  varian:	${VARIAN}
  
  install: printer
! 	-mkdir ${DESTDIR}/${LIBDIR}
! 	-rm -f ${DESTDIR}/${LIBDIR}/ln03filter
! 	for i in ${PRINTER}; do install -s $$i ${DESTDIR}/${LIBDIR}/$$i; done
  	for i in ${LN01FILTERS}; do \
! 		rm -f ${DESTDIR}/${LIBDIR}/$$i; \
! 		ln -s ln01filter ${DESTDIR}/${LIBDIR}/$$i; \
  	done
  installv: varian
! 	-mkdir ${DESTDIR}/${LIBDIR}
! 	install -s vfontinfo ${DESTDIR}/${LIBDIR}/vfontinfo
! 	install -s vwidth ${DESTDIR}/${LIBDIR}/vwidth
! 	install -s vfw ${DESTDIR}/${LIBDIR}/vfw
! 	install -s fcvt ${DESTDIR}/${LIBDIR}/fcvt
! 	install -s rotate ${DESTDIR}/${LIBDIR}/rotate
! 	install -s rotprt ${DESTDIR}/${LIBDIR}/rotprt
! 	install -s rvsort ${DESTDIR}/${LIBDIR}/rvsort
! 	install -s rvcat ${DESTDIR}/${LIBDIR}/rvcat
! 	install -s vsort ${DESTDIR}/${LIBDIR}/vsort
! 	install -s vcat ${DESTDIR}/${LIBDIR}/vcat
! 	install -s vpf ${DESTDIR}/${LIBDIR}/vpf
! 	ln ${DESTDIR}/${LIBDIR}/vpf ${DESTDIR}/${LIBDIR}/vpfW
! 	install -s vpsf ${DESTDIR}/${LIBDIR}/vpsf
! 	install -s vdmp ${DESTDIR}/${LIBDIR}/vdmp
! 	install -s vpltdmp ${DESTDIR}/${LIBDIR}/vpltdmp
! 	install -s vplotf ${DESTDIR}/${LIBDIR}/vplotf
  
  clean:
  	rm -f ${PRINTER} ${VARIAN} *.o ln01filter.c
--- 29,59 ----
  varian:	${VARIAN}
  
  install: printer
! 	-mkdir ${DESTDIR}${LIBDIR}
! 	-rm -f ${DESTDIR}${LIBDIR}/ln03filter
! 	for i in ${PRINTER}; do install -c -s $$i ${DESTDIR}${LIBDIR}/$$i; done
  	for i in ${LN01FILTERS}; do \
! 		rm -f ${DESTDIR}${LIBDIR}/$$i; \
! 		ln -s ln01filter ${DESTDIR}${LIBDIR}/$$i; \
  	done
  installv: varian
! 	-mkdir ${DESTDIR}${LIBDIR}
! 	install -c -s vfontinfo ${DESTDIR}${LIBDIR}/vfontinfo
! 	install -c -s vwidth ${DESTDIR}${LIBDIR}/vwidth
! 	install -c -s vfw ${DESTDIR}${LIBDIR}/vfw
! 	install -c -s fcvt ${DESTDIR}${LIBDIR}/fcvt
! 	install -c -s rotate ${DESTDIR}${LIBDIR}/rotate
! 	install -c -s rotprt ${DESTDIR}${LIBDIR}/rotprt
! 	install -c -s rvsort ${DESTDIR}${LIBDIR}/rvsort
! 	install -c -s rvcat ${DESTDIR}${LIBDIR}/rvcat
! 	install -c -s vsort ${DESTDIR}${LIBDIR}/vsort
! 	install -c -s vcat ${DESTDIR}${LIBDIR}/vcat
! 	install -c -s vpf ${DESTDIR}${LIBDIR}/vpf
! 	ln ${DESTDIR}${LIBDIR}/vpf ${DESTDIR}${LIBDIR}/vpfW
! 	install -c -s vpsf ${DESTDIR}${LIBDIR}/vpsf
! 	install -c -s vdmp ${DESTDIR}${LIBDIR}/vdmp
! 	install -c -s vpltdmp ${DESTDIR}${LIBDIR}/vpltdmp
! 	install -c -s vplotf ${DESTDIR}${LIBDIR}/vplotf
  
  clean:
  	rm -f ${PRINTER} ${VARIAN} *.o ln01filter.c
*** /tmp/,RCSt1008609	Fri Aug 24 11:06:24 1990
--- man/Makefile	Mon Jul 23 22:40:52 1990
***************
*** 1,6 ****
! MAN1=${DESTDIR}/usr/man/man1
! MAN5=${DESTDIR}/usr/man/man5
! MAN8=${DESTDIR}/usr/man/man8
  all depend:
  
  clean:
--- 1,7 ----
! MANDIR=/usr/athena/man
! MAN1=${DESTDIR}${MANDIR}/man1
! MAN5=${DESTDIR}${MANDIR}/man5
! MAN8=${DESTDIR}${MANDIR}/man8
  all depend:
  
  clean:
***************
*** 7,17 ****
  	rm -f *~
  
  install:
! 	install -c -m 644 lpquota.1 ${MAN1}/
  	install -c -m 644 lpc.8 ${MAN8}/
  	install -c -m 644 lpq.1 ${MAN1}/
  	install -c -m 644 lprm.1 ${MAN1}/
  	install -c -m 644 lpr.1 ${MAN1}/
! 	install -c -m 644 lptest.1 ${MAN1}/
  	install -c -m 644 printcap.5 ${MAN5}/
  	install -c -m 644 lpd.8 ${MAN8}/
--- 8,18 ----
  	rm -f *~
  
  install:
! #	install -c -m 644 lpquota.1 ${MAN1}/
  	install -c -m 644 lpc.8 ${MAN8}/
  	install -c -m 644 lpq.1 ${MAN1}/
  	install -c -m 644 lprm.1 ${MAN1}/
  	install -c -m 644 lpr.1 ${MAN1}/
! #	install -c -m 644 lptest.1 ${MAN1}/
  	install -c -m 644 printcap.5 ${MAN5}/
  	install -c -m 644 lpd.8 ${MAN8}/

home help back first fref pref prev next nref lref last post