220 lines
7.2 KiB
Plaintext
220 lines
7.2 KiB
Plaintext
--- Makefile.orig 2010-06-05 09:48:22 UTC
|
|
+++ Makefile
|
|
@@ -6,7 +6,7 @@
|
|
# grok my code, so please use gcc there. On ISC 4.0, use "icc".).
|
|
#
|
|
# if you are cross-compiling, this is the C compiler for the target platform
|
|
-CC=gcc
|
|
+#CC=gcc
|
|
#CC=cc
|
|
#
|
|
# if you are cross-compiling, *this* needs to be the C compiler that
|
|
@@ -109,7 +109,7 @@ HOSTCC=$(CC)
|
|
# USTAT - ustat(), no statfs etc.
|
|
#
|
|
#CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
|
|
-CFLAGS=-O2 -Wall -pipe
|
|
+#CFLAGS=-O2 -Wall -pipe
|
|
#CFLAGS=-O -DSVR4
|
|
#CFLAGS=-O -DSVR4 -DSVR42
|
|
#CFLAGS=-O -DUSE_POLL
|
|
@@ -151,7 +151,7 @@ LDFLAGS=
|
|
# 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
|
|
@@ -171,7 +171,8 @@ LIBS=
|
|
#
|
|
# 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
|
|
+INSTALL_PROGRAM=install -s -c
|
|
#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
|
|
@@ -223,20 +224,20 @@ FAX_SPOOL_OUT=$(FAX_SPOOL)/outgoing
|
|
# (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER
|
|
# MUST NOT BE root or any other privileged account).
|
|
#
|
|
-FAX_OUT_USER=fax
|
|
+FAX_OUT_USER=root
|
|
#
|
|
#
|
|
# Where section 1 manual pages should be placed
|
|
-MAN1DIR=$(prefix)/man/man1
|
|
+MAN1DIR=$(prefix)/share/man/man1
|
|
#
|
|
# Where section 4 manual pages (mgettydefs.4) should be placed
|
|
-MAN4DIR=$(prefix)/man/man4
|
|
+MAN4DIR=$(prefix)/share/man/man4
|
|
#
|
|
# Section 5 man pages (faxqueue.5)
|
|
-MAN5DIR=$(prefix)/man/man5
|
|
+MAN5DIR=$(prefix)/share/man/man5
|
|
#
|
|
# Section 8 man pages (sendfax.8)
|
|
-MAN8DIR=$(prefix)/man/man8
|
|
+MAN8DIR=$(prefix)/share/man/man8
|
|
#
|
|
# Where the GNU Info-Files are located
|
|
#
|
|
@@ -265,12 +266,12 @@ AWK=awk
|
|
# and the "tkperl" frontends without PERL, so don't worry if you don't
|
|
# have it.
|
|
# If you specify command line arguments (-w), don't forget the quotes!
|
|
-PERL="/usr/bin/perl -w"
|
|
+PERL="$(LOCALBASE)/bin/perl -w"
|
|
#
|
|
# 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
|
|
@@ -282,9 +283,9 @@ TKPERL=/usr/bin/tkperl
|
|
# 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
|
|
@@ -324,7 +325,7 @@ all: bin-all doc-man-only
|
|
|
|
all: bin-all doc-man-only
|
|
|
|
-bin-all: mgetty sendfax newslock sedscript subdirs call-back
|
|
+bin-all: mgetty sendfax newslock sedscript subdirs call-back vgetty
|
|
|
|
# a few C files need extra compiler arguments
|
|
|
|
@@ -585,44 +586,39 @@ bindist: all doc-all sedscript
|
|
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)
|
|
+ -test -d $(STAGEDIR)$(BINDIR) || ( ./mkidirs $(STAGEDIR)$(BINDIR) ; chmod 755 $(STAGEDIR)$(BINDIR) )
|
|
+ $(INSTALL_PROGRAM) -m 755 newslock $(STAGEDIR)$(BINDIR)
|
|
|
|
- -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
|
|
- if [ -f $(SBINDIR)/mgetty ] ; then \
|
|
- mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old ; fi
|
|
- if [ -f $(SBINDIR)/sendfax ] ; then \
|
|
- mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old ; fi
|
|
- $(INSTALL) -s -m 700 mgetty $(SBINDIR)
|
|
- $(INSTALL) -s -m 755 sendfax $(SBINDIR)
|
|
+ -test -d $(STAGEDIR)$(SBINDIR) || ( ./mkidirs $(STAGEDIR)$(SBINDIR) ; chmod 755 $(STAGEDIR)$(SBINDIR) )
|
|
+ -mv -f $(STAGEDIR)$(SBINDIR)/mgetty $(STAGEDIR)$(SBINDIR)/mgetty.old
|
|
+ -mv -f $(STAGEDIR)$(SBINDIR)/sendfax $(STAGEDIR)$(SBINDIR)/sendfax.old
|
|
+ $(INSTALL_PROGRAM) -s -m 700 mgetty $(STAGEDIR)$(SBINDIR)
|
|
+ $(INSTALL_PROGRAM) -s -m 755 sendfax $(STAGEDIR)$(SBINDIR)
|
|
+ $(INSTALL_PROGRAM) -s -m 755 callback/callback $(STAGEDIR)$(SBINDIR)
|
|
#
|
|
# data files + directories
|
|
#
|
|
- test -d $(LIBDIR) || \
|
|
- ( ./mkidirs $(LIBDIR) && chmod 755 $(LIBDIR) )
|
|
- test -d $(CONFDIR) || \
|
|
- ( ./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 || \
|
|
- $(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/
|
|
+ test -d $(STAGEDIR)$(LIBDIR) || \
|
|
+ ( ./mkidirs $(STAGEDIR)$(LIBDIR) && chmod 755 $(STAGEDIR)$(LIBDIR) )
|
|
+ test -d $(STAGEDIR)$(CONFDIR) || \
|
|
+ ( ./mkidirs $(STAGEDIR)$(CONFDIR) && chmod 755 $(STAGEDIR)$(CONFDIR))
|
|
+ test -f $(STAGEDIR)$(CONFDIR)/login.config || \
|
|
+ $(INSTALL) -m 600 login.config $(STAGEDIR)$(CONFDIR)/
|
|
+ test -f $(STAGEDIR)$(CONFDIR)/dialin.config || \
|
|
+ $(INSTALL) -m 600 dialin.config $(STAGEDIR)$(CONFDIR)/
|
|
+ test -f $(STAGEDIR)$(CONFDIR)/faxrunq.config || \
|
|
+ $(INSTALL) -m 644 faxrunq.config $(STAGEDIR)$(CONFDIR)/
|
|
#
|
|
# test for outdated stuff
|
|
#
|
|
- -@if test -f $(LIBDIR)/mgetty.login ; \
|
|
+ -@if test -f $(STAGEDIR)$(LIBDIR)/mgetty.login ; \
|
|
then \
|
|
echo "WARNING: the format of $(LIBDIR)/mgetty.login has " ;\
|
|
echo "been changed. Because of this, to avoid confusions, it's called " ;\
|
|
@@ -630,24 +626,9 @@ install.bin: mgetty sendfax newslock \
|
|
echo "" ;\
|
|
fi
|
|
#
|
|
-# fax spool directories
|
|
-#
|
|
- test -d $(spool) || \
|
|
- ( mkdir $(spool) && chmod 755 $(spool) )
|
|
- test -d $(FAX_SPOOL) || \
|
|
- ( mkdir $(FAX_SPOOL) && \
|
|
- chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
|
|
- chmod 755 $(FAX_SPOOL) )
|
|
- test -d $(FAX_SPOOL_IN) || \
|
|
- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
|
|
- test -d $(FAX_SPOOL_OUT) || \
|
|
- mkdir $(FAX_SPOOL_OUT)
|
|
- chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
|
|
- chmod 755 $(FAX_SPOOL_OUT)
|
|
-#
|
|
# g3 tool programs
|
|
#
|
|
- cd g3 && $(MAKE) install INSTALL="$(INSTALL)" \
|
|
+ cd g3 && $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \
|
|
BINDIR=$(BINDIR) \
|
|
LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
|
|
#
|
|
@@ -663,7 +644,7 @@ install.bin: mgetty sendfax newslock \
|
|
if [ ! -z "$(INSTALL_MECHO)" ] ; then \
|
|
cd compat ; \
|
|
$(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
|
|
- $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
|
|
+ $(INSTALL) -s -m 755 mg.echo $(STAGEDIR)$(BINDIR) ; \
|
|
fi
|
|
|
|
#
|
|
@@ -671,11 +652,11 @@ install.doc:
|
|
#
|
|
install.doc:
|
|
cd doc ; $(MAKE) install INSTALL="$(INSTALL)" \
|
|
- MAN1DIR=$(MAN1DIR) \
|
|
- MAN4DIR=$(MAN4DIR) \
|
|
- MAN5DIR=$(MAN5DIR) \
|
|
- MAN8DIR=$(MAN8DIR) \
|
|
- INFODIR=$(INFODIR)
|
|
+ MAN1DIR=$(STAGEDIR)$(MAN1DIR) \
|
|
+ MAN4DIR=$(STAGEDIR)$(MAN4DIR) \
|
|
+ MAN5DIR=$(STAGEDIR)$(MAN5DIR) \
|
|
+ MAN8DIR=$(STAGEDIR)$(MAN8DIR) \
|
|
+ INFODIR=$(STAGEDIR)$(INFODIR)
|
|
|
|
#
|
|
# WWW frontend stuff
|