--- Makefile.orig Sun Nov 22 07:19:06 1998 +++ Makefile Tue Dec 1 02:11:01 1998 @@ -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 #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 @@ -169,7 +169,8 @@ # # 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 +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 @@ -247,7 +248,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 +260,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 @@ -301,7 +302,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 @@ -560,21 +561,21 @@ 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 + login.config #mgetty.config sendfax.config # # binaries # -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) - $(INSTALL) -m 755 newslock $(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) -s -m 700 mgetty $(SBINDIR) - $(INSTALL) -s -m 700 sendfax $(SBINDIR) + $(INSTALL_PROGRAM) -m 700 mgetty $(SBINDIR) + $(INSTALL_PROGRAM) -m 700 sendfax $(SBINDIR) # # data files + directories # @@ -584,10 +585,10 @@ ( ./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)/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,7 +619,7 @@ # # g3 tool programs # - cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \ + cd g3 ; $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \ BINDIR=$(BINDIR) \ LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) # @@ -633,7 +634,7 @@ if [ ! -z "$(INSTALL_MECHO)" ] ; then \ cd compat ; \ $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ - $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ + $(INSTALL_PROGRAM) -m 755 mg.echo $(BINDIR) ; \ fi #