*** Makefile.orig	Sun Nov 22 05:19:06 1998
--- Makefile	Thu Dec 17 06:29:46 1998
***************
*** 4,11 ****
  #
  # this is the C compiler to use (on SunOS, the standard "cc" does not
  # grok my code, so please use gcc there. On ISC 4.0, use "icc".).
! CC=gcc
! #CC=cc
  #
  #### C Compiler Flags ####
  #
--- 4,11 ----
  #
  # this is the C compiler to use (on SunOS, the standard "cc" does not
  # grok my code, so please use gcc there. On ISC 4.0, use "icc".).
! #CC=gcc
! CC=cc
  #
  #### C Compiler Flags ####
  #
***************
*** 107,113 ****
  # prompt first. Don't forget to activate the /AutoPPP/ line in login.config!
  #
  #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
! CFLAGS=-O2 -Wall -pipe
  #CFLAGS=-O -DSVR4
  #CFLAGS=-O -DSVR4 -DSVR42
  #CFLAGS=-O -DUSE_POLL
--- 107,113 ----
  # prompt first. Don't forget to activate the /AutoPPP/ line in login.config!
  #
  #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
! CFLAGS+=-DAUTO_PPP
  #CFLAGS=-O -DSVR4
  #CFLAGS=-O -DSVR4 -DSVR42
  #CFLAGS=-O -DUSE_POLL
***************
*** 144,155 ****
  #
  # On SCO Xenix, add -ldir -lx
  #
! # For FreeBSD, add "-lutil" if the linker complains about
  # 	"utmp.o: unresolved symbod _login"
  # For Linux, add "-lutil" if the linker complains about "updwtmp".
  #
  LDFLAGS=
! LIBS=
  #LIBS=-lprot -lsocket				# SCO Unix
  #LIBS=-lsocket
  #LIBS=-lbsd					# OSF/1
--- 144,155 ----
  #
  # On SCO Xenix, add -ldir -lx
  #
! # For FreeBSD and OpenBSD, add "-lutil" if the linker complains about
  # 	"utmp.o: unresolved symbod _login"
  # For Linux, add "-lutil" if the linker complains about "updwtmp".
  #
  LDFLAGS=
! LIBS=-lutil
  #LIBS=-lprot -lsocket				# SCO Unix
  #LIBS=-lsocket
  #LIBS=-lbsd					# OSF/1
***************
*** 169,175 ****
  #
  # if your systems doesn't have one, use the shell script that I provide
  # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
! INSTALL=install -c -o bin -g bin
  #INSTALL=install -c -o root -g wheel		# NeXT/BSD
  #INSTALL=/usr/ucb/install -c -o bin -g bin	# AIX, Solaris 2.x
  #INSTALL=installbsd -c -o bin -g bin		# OSF/1, AIX 4.1, 4.2
--- 169,176 ----
  #
  # if your systems doesn't have one, use the shell script that I provide
  # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
! INSTALL=install -c -o root -g wheel
! INSTALL_PROGRAM=install -s -c -o root -g wheel
  #INSTALL=install -c -o root -g wheel		# NeXT/BSD
  #INSTALL=/usr/ucb/install -c -o bin -g bin	# AIX, Solaris 2.x
  #INSTALL=installbsd -c -o bin -g bin		# OSF/1, AIX 4.1, 4.2
***************
*** 177,187 ****
  #
  # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr
  #
! prefix=/usr/local
  #
  # prefix for all the spool directories (usually /usr/spool or /var/spool)
  #
! spool=/var/spool
  #
  # where the mgetty + sendfax binaries live (used for "make install")
  #
--- 178,188 ----
  #
  # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr
  #
! prefix?=/usr/local
  #
  # prefix for all the spool directories (usually /usr/spool or /var/spool)
  #
! spool?=/var/spool
  #
  # where the mgetty + sendfax binaries live (used for "make install")
  #
***************
*** 197,203 ****
  #
  # where the configuration files (*.config, aliases, fax.allow/deny) go to
  #
! CONFDIR=$(prefix)/etc/mgetty+sendfax
  #CONFDIR=/etc/default/
  #
  #
--- 198,204 ----
  #
  # where the configuration files (*.config, aliases, fax.allow/deny) go to
  #
! CONFDIR?=$(prefix)/etc/mgetty+sendfax
  #CONFDIR=/etc/default/
  #
  #
***************
*** 247,253 ****
  # If you have Perl with TK extentions, define it here. This may be the
  # same as PERL=... above, or different, if you have TkPerl statically
  # linked.
! TKPERL=/usr/bin/tkperl
  #
  #
  # An echo program that understands escapes like "\n" for newline or
--- 248,254 ----
  # If you have Perl with TK extentions, define it here. This may be the
  # same as PERL=... above, or different, if you have TkPerl statically
  # linked.
! #TKPERL=/usr/bin/tkperl
  #
  #
  # An echo program that understands escapes like "\n" for newline or
***************
*** 259,267 ****
  # please use the "mg.echo" program provided in the compat/ subdirectory.
  # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
  #
! ECHO="echo"
  #
! # INSTALL_MECHO=mg.echo
  
  #
  # for mgetty, that's it. If you want to use the voice
--- 260,268 ----
  # please use the "mg.echo" program provided in the compat/ subdirectory.
  # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
  #
! ECHO="mg.echo"
  #
! INSTALL_MECHO=mg.echo
  
  #
  # for mgetty, that's it. If you want to use the voice
***************
*** 269,276 ****
  
  # To maintain security, I recommend creating a new group for
  # users who are allowed to manipulate the recorded voice messages.
! PHONE_GROUP=phone
! PHONE_PERMS=770
  
  # Add -DNO_STRSTR to CFLAGS if you don't have strstr().
  
--- 270,277 ----
  
  # To maintain security, I recommend creating a new group for
  # users who are allowed to manipulate the recorded voice messages.
! PHONE_GROUP?=wheel
! PHONE_PERMS?=700
  
  # Add -DNO_STRSTR to CFLAGS if you don't have strstr().
  
***************
*** 301,307 ****
  
  all:	bin-all doc-all
  
! bin-all: mgetty sendfax newslock subdirs call-back 
  
  # a few C files need extra compiler arguments
  
--- 302,308 ----
  
  all:	bin-all doc-all
  
! bin-all: mgetty sendfax newslock subdirs call-back vgetty
  
  # a few C files need extra compiler arguments
  
***************
*** 560,580 ****
  	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
  
  
! install: install.bin install.doc
  
  install.bin: mgetty sendfax newslock \
! 		login.config mgetty.config sendfax.config 
  #
  # binaries
  #
  	-test -d $(BINDIR)  || ( ./mkidirs $(BINDIR)  ; chmod 755 $(BINDIR)  )
! 	$(INSTALL) -m 755 newslock $(BINDIR)
  
  	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
  	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
  	-mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
! 	$(INSTALL) -s -m 700 mgetty $(SBINDIR)
! 	$(INSTALL) -s -m 700 sendfax $(SBINDIR)
  #
  # data files + directories
  #
--- 561,581 ----
  	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
  
  
! install: install.bin install.doc install-vgetty
  
  install.bin: mgetty sendfax newslock \
! 		login.config #mgetty.config sendfax.config 
  #
  # binaries
  #
  	-test -d $(BINDIR)  || ( ./mkidirs $(BINDIR)  ; chmod 755 $(BINDIR)  )
! 	$(INSTALL_PROGRAM) -m 755 newslock $(BINDIR)
  
  	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
  	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
  	-mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
! 	$(INSTALL_PROGRAM) -m 700 mgetty $(SBINDIR)
! 	$(INSTALL_PROGRAM) -m 700 sendfax $(SBINDIR)
  #
  # data files + directories
  #
***************
*** 584,593 ****
  		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
  	test -f $(CONFDIR)/login.config || \
  		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
! 	test -f $(CONFDIR)/mgetty.config || \
! 		$(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/
! 	test -f $(CONFDIR)/sendfax.config || \
! 		$(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/
  	test -f $(CONFDIR)/dialin.config || \
  		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
  	test -f $(CONFDIR)/faxrunq.config || \
--- 585,594 ----
  		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
  	test -f $(CONFDIR)/login.config || \
  		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
! #	test -f $(CONFDIR)/mgetty.config || \
! #		$(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/
! #	test -f $(CONFDIR)/sendfax.config || \
! #		$(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/
  	test -f $(CONFDIR)/dialin.config || \
  		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
  	test -f $(CONFDIR)/faxrunq.config || \
***************
*** 618,624 ****
  #
  # g3 tool programs
  #
! 	cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \
  				BINDIR=$(BINDIR) \
  				LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
  #
--- 619,625 ----
  #
  # g3 tool programs
  #
! 	cd g3 ; $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \
  				BINDIR=$(BINDIR) \
  				LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
  #
***************
*** 633,639 ****
  	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
  	    cd compat ; \
  	    $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
! 	    $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
  	fi
  
  #
--- 634,640 ----
  	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
  	    cd compat ; \
  	    $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
! 	    $(INSTALL_PROGRAM) -m 755 mg.echo $(BINDIR) ; \
  	fi
  
  #
