$NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ --- Makefile.orig Sun Nov 22 00:19:06 1998 +++ Makefile Mon Aug 23 22:57:53 1999 @@ -4,8 +4,8 @@ # # 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 +#CC=gcc +CC=cc # #### C Compiler Flags #### # @@ -107,7 +107,7 @@ # 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+=-DAUTO_PPP -DPREFIX=\"${PREFIX}\" #CFLAGS=-O -DSVR4 #CFLAGS=-O -DSVR4 -DSVR42 #CFLAGS=-O -DUSE_POLL @@ -149,7 +149,7 @@ # For Linux, add "-lutil" if the linker complains about "updwtmp". # LDFLAGS= -LIBS= +LIBS=-lutil #LIBS=-lprot -lsocket # SCO Unix #LIBS=-lsocket #LIBS=-lbsd # OSF/1 @@ -177,7 +177,7 @@ # # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr # -prefix=/usr/local +prefix=${PREFIX} # # prefix for all the spool directories (usually /usr/spool or /var/spool) # @@ -185,19 +185,19 @@ # # where the mgetty + sendfax binaries live (used for "make install") # -SBINDIR=$(prefix)/sbin +SBINDIR=${PREFIX}/sbin # # where the user executable binaries live # -BINDIR=$(prefix)/bin +BINDIR=${PREFIX}/bin # # where the font+coverpage files go # -LIBDIR=$(prefix)/lib/mgetty+sendfax +LIBDIR=${PREFIX}/lib/mgetty+sendfax # # where the configuration files (*.config, aliases, fax.allow/deny) go to # -CONFDIR=$(prefix)/etc/mgetty+sendfax +CONFDIR=${PREFIX}/etc/mgetty+sendfax #CONFDIR=/etc/default/ # # @@ -209,20 +209,20 @@ # # # Where section 1 manual pages should be placed -MAN1DIR=$(prefix)/man/man1 +MAN1DIR=${PREFIX}/man/man1 # # Where section 4 manual pages (mgettydefs.4) should be placed -MAN4DIR=$(prefix)/man/man4 +MAN4DIR=${PREFIX}/man/man4 # # Section 5 man pages (faxqueue.5) -MAN5DIR=$(prefix)/man/man5 +MAN5DIR=${PREFIX}/man/man5 # # Section 8 man pages (sendfax.8) -MAN8DIR=$(prefix)/man/man8 +MAN8DIR=${PREFIX}/man/man8 # # Where the GNU Info-Files are located # -INFODIR=$(prefix)/info +INFODIR=${PREFIX}/info # # # A shell that understands bourne-shell syntax @@ -247,7 +247,7 @@ # 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 +#TKPERL=/usr/bin/tkperl # # # An echo program that understands escapes like "\n" for newline or @@ -259,9 +259,9 @@ # please use the "mg.echo" program provided in the compat/ subdirectory. # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo # -ECHO="echo" +ECHO="mg.echo" # -# INSTALL_MECHO=mg.echo +INSTALL_MECHO=mg.echo # # for mgetty, that's it. If you want to use the voice @@ -269,7 +269,7 @@ # To maintain security, I recommend creating a new group for # users who are allowed to manipulate the recorded voice messages. -PHONE_GROUP=phone +PHONE_GROUP=uucp PHONE_PERMS=770 # Add -DNO_STRSTR to CFLAGS if you don't have strstr(). @@ -301,7 +301,7 @@ all: bin-all doc-all -bin-all: mgetty sendfax newslock subdirs call-back +bin-all: mgetty sendfax newslock subdirs call-back vgetty # a few C files need extra compiler arguments @@ -547,8 +547,8 @@ # internal: use this to create a "clean" mgetty+sendfax tree bindist: all doc-all sedscript -rm -rf bindist - ./mkidirs bindist$(prefix) bindist$(spool) - bd=`pwd`/bindist; PATH=`pwd`:"$$PATH" $(MAKE) prefix=$$bd$(prefix) \ + ./mkidirs bindist${PREFIX} bindist$(spool) + bd=`pwd`/bindist; PATH=`pwd`:"$$PATH" $(MAKE) prefix=$$bd${PREFIX} \ BINDIR=$$bd$(BINDIR) SBINDIR=$$bd$(SBINDIR) \ LIBDIR=$$bd$(LIBDIR) CONFDIR=$$bd$(CONFDIR) \ spool=$$bd$(spool) FAX_SPOOL=$$bd$(FAX_SPOOL) \ @@ -560,7 +560,7 @@ cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz * -install: install.bin install.doc +install: install.bin install.doc install-vgetty install.bin: mgetty sendfax newslock \ login.config mgetty.config sendfax.config @@ -568,7 +568,7 @@ # binaries # -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) - $(INSTALL) -m 755 newslock $(BINDIR) + $(INSTALL) -s -m 755 newslock $(BINDIR) -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old