| diff -aruN a/Makefile b/Makefile |
| --- a/Makefile 2010-09-07 14:52:37.000000000 -0700 |
| +++ b/Makefile 2010-09-07 15:29:09.000000000 -0700 |
| @@ -45,7 +45,7 @@ |
| # |
| # SysV.4 Solaris 2.x OSF AIX |
| #REAL_DAEMON_DIR=/usr/sbin |
| -REAL_DAEMON_DIR=/usr/sbin |
| +# |
| # BSD 4.4 |
| #REAL_DAEMON_DIR=/usr/libexec |
| # |
| @@ -90,224 +90,224 @@ |
| |
| # This is good for many BSD+SYSV hybrids with NIS (formerly YP). |
| generic aix osf alpha dynix: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \ |
| NETGROUP=-DNETGROUP TLI= all |
| |
| # Ditto, with vsyslog |
| sunos4: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \ |
| NETGROUP=-DNETGROUP VSYSLOG= TLI= all |
| |
| # Generic with resolver library. |
| generic-resolver: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS=-lresolv RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \ |
| NETGROUP=-DNETGROUP TLI= all |
| |
| # The NeXT loader needs "-m" or it barfs on redefined library functions. |
| next: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS=-m RANLIB=ranlib ARFLAGS=rv AUX_OBJ=environ.o \ |
| NETGROUP=-DNETGROUP TLI= all |
| |
| # SunOS for the 386 was frozen at release 4.0.x. |
| sunos40: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ="setenv.o strcasecmp.o" \ |
| NETGROUP=-DNETGROUP VSYSLOG= TLI= all |
| |
| # Ultrix is like aix, next, etc., but has miscd and setenv(). |
| ultrix: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \ |
| NETGROUP=-DNETGROUP TLI= all miscd |
| |
| # This works on EP/IX 1.4.3 and will likely work on Mips (reggers@julian.uwo.ca) |
| epix: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=environ.o \ |
| NETGROUP=-DNETGROUP TLI= SYSTYPE="-systype bsd43" all |
| |
| # Freebsd and linux by default have no NIS. |
| 386bsd bsdos: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \ |
| EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all |
| |
| freebsd: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-L/usr/local/v6/lib -linet6" \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \ |
| EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6 -Dss_family=__ss_family -Dss_len=__ss_len" \ |
| VSYSLOG= all |
| |
| netbsd: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \ |
| EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6 -Dss_family=__ss_family -Dss_len=__ss_len" VSYSLOG= all |
| |
| linux: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS=-lnsl RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \ |
| NETGROUP="-DNETGROUP" TLI= VSYSLOG= BUGS= \ |
| EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all |
| |
| gnu: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS=-lnsl RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \ |
| NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= \ |
| EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT" all |
| |
| # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x. |
| hpux hpux8 hpux9 hpux10: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=echo ARFLAGS=rv AUX_OBJ=setenv.o \ |
| NETGROUP=-DNETGROUP TLI= all |
| |
| # ConvexOS-10.x with UltraNet support (ukkonen@csc.fi). |
| convex-ultranet: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS=-lulsock RANLIB=ranlib ARFLAGS=rv AUX_OBJ=environ.o \ |
| NETGROUP=-DNETGROUP TLI= all |
| |
| # Generic support for the Dynix/PTX version of TLI. |
| ptx-generic: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -linet -lnsl" RANLIB=echo ARFLAGS=rv \ |
| AUX_OBJ="setenv.o strcasecmp.o ptx.o" NETGROUP= TLI=-DPTX all |
| |
| # With UDP support optimized for PTX 2.x (timw@sequent.com). |
| ptx-2.x: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -linet -lnsl" RANLIB=echo ARFLAGS=rv \ |
| AUX_OBJ="setenv.o strcasecmp.o tli-sequent.o" NETGROUP= \ |
| TLI=-DTLI_SEQUENT all |
| |
| # IRIX 4.0.x has a special ar(1) flag. |
| irix4: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lc -lsun" RANLIB=echo ARFLAGS=rvs AUX_OBJ=setenv.o \ |
| NETGROUP=-DNETGROUP TLI= all |
| |
| # IRIX 5.2 is SYSV4 with several broken things (such as -lsocket -lnsl). |
| irix5: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS=-lsun RANLIB=echo ARFLAGS=rv VSYSLOG= \ |
| NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI= all |
| |
| # IRIX 6.2 (tucker@math.unc.edu). Must find a better value than 200000. |
| irix6: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=echo ARFLAGS=rv VSYSLOG= \ |
| NETGROUP=-DNETGROUP EXTRA_CFLAGS="-DBSD=200000" TLI= all |
| |
| # SunOS 5.x is another SYSV4 variant. |
| sunos5: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl" RANLIB=echo ARFLAGS=rv VSYSLOG= \ |
| NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI \ |
| BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" all |
| |
| # SunOS 5.8 is another SYSV4 variant, but has IPv6 support |
| solaris8: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl" RANLIB=echo ARFLAGS=rv VSYSLOG= \ |
| NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI \ |
| EXTRA_CFLAGS="-DINET6 -DNO_CLONE_DEVICE -DINT32_T" all |
| |
| # Generic SYSV40 |
| esix sysv4: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl" RANLIB=echo ARFLAGS=rv \ |
| NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI all |
| |
| # DG/UX 5.4.1 and 5.4.2 have an unusual inet_addr() interface. |
| dgux: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS=-lnsl RANLIB=echo ARFLAGS=rv \ |
| NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI \ |
| BUGS="$(BUGS) -DINET_ADDR_BUG" all |
| |
| dgux543: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS=-lnsl RANLIB=echo ARFLAGS=rv \ |
| NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI all |
| |
| # NCR UNIX 02.02.01 and 02.03.00 (Alex Chircop, msu@unimt.mt) |
| ncrsvr4: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lresolv -lnsl -lsocket" RANLIB=echo ARFLAGS=rv \ |
| AUX_OBJ="setenv.o strcasecmp.o" NETGROUP= TLI=-DTLI \ |
| EXTRA_CFLAGS="" FROM_OBJ=ncr.o all |
| |
| # Tandem SYSV4 (eqawas@hedgehog.ac.cowan.edu.au) |
| tandem: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl" RANLIB=echo ARFLAGS=rv \ |
| NETGROUP= AUX_OBJ="setenv.o strcasecmp.o" TLI=-DTLI all |
| |
| # Amdahl UTS 2.1.5 (Richard.Richmond@bridge.bst.bls.com) |
| uts215: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket" RANLIB=echo \ |
| ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP=-DNO_NETGROUP TLI= all |
| |
| # UXP/DS System V.4 clone (vic@uida0.uida.es). |
| uxp: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-L/usr/ucblib -lsocket -lnsl -lucb" \ |
| RANLIB=echo ARFLAGS=rv NETGROUP=-DNETGROUP \ |
| AUX_OBJ=setenv.o TLI="-DTLI -DDRS_XTI" all |
| |
| # DELL System V.4 Issue 2.2 using gcc (kim@tac.nyc.ny.us, jurban@norden1.com) |
| dell-gcc: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl" RANLIB=ranlib ARFLAGS=rv CC=gcc \ |
| AUX_OBJ="setenv.o strcasecmp.o" TLI=-DTLI all |
| |
| # SCO 3.2v4.1 no frills (jedwards@sol1.solinet.net). |
| sco: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl_s" RANLIB=echo ARFLAGS=rv \ |
| NETGROUP= AUX_OBJ=setenv.o TLI= all |
| |
| # SCO OpenDesktop 2.0, release 3.2 (peter@midnight.com). Please simplify. |
| sco-od2: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lrpcsvc -lrpc -lyp -lrpc -lrpcsvc -lsocket" \ |
| RANLIB=echo ARFLAGS=rv AUX_OBJ=setenv.o \ |
| NETGROUP=-DNETGROUP TLI= all |
| |
| # SCO 3.2v4.2 with TCP/IP 1.2.1 (Eduard.Vopicka@vse.cz). Please simplify. |
| sco-nis: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lyp -lrpc -lsocket -lyp -lc_s -lc" \ |
| RANLIB=echo ARFLAGS=rv AUX_OBJ=setenv.o \ |
| NETGROUP=-DNETGROUP TLI= EXTRA_CFLAGS="-nointl -DNO_NETGRENT" all |
| |
| # SCO 3.2v5.0.0 OpenServer 5 (bob@odt.handy.com, bill@razorlogic.com) |
| sco-os5: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lrpcsvc -lsocket" RANLIB=echo ARFLAGS=rv VSYSLOG= \ |
| AUX_OBJ=setenv.o NETGROUP=-DNETGROUP TLI= all |
| |
| # sinix 5.42 setjmp workaround (szrzs023@ub3.ub.uni-kiel.de) |
| sinix: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl -L/usr/ccs/lib -lc -L/usr/ucblib -lucb" \ |
| RANLIB=echo ARFLAGS=rv AUX_OBJ=setenv.o TLI=-DTLI all |
| |
| # Domain SR10.4. Build under bsd, run under either sysv3 or bsd43. |
| apollo: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \ |
| NETGROUP=-DNETGROUP TLI= SYSTYPE="-A run,any -A sys,any" all |
| |
| # Pyramid OSx 5.1, using the BSD universe. |
| pyramid: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ="environ.o vfprintf.o" \ |
| STRINGS="-Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy" \ |
| NETGROUP="-DNETGROUP -DUSE_GETDOMAIN" TLI= all |
| @@ -315,68 +315,68 @@ |
| # Untested. |
| mips: |
| @echo "Warning: some definitions may be wrong." |
| - make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + ${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=environ.o \ |
| NETGROUP=-DNETGROUP TLI= SYSTYPE="-sysname bsd43" all |
| |
| # Cray (tested with UNICOS 7.0.4). |
| unicos7: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS=-lnet RANLIB=echo ARFLAGS=rv \ |
| EXTRA_CFLAGS=-DINADDR_NONE="\"((unsigned long) -1)\"" \ |
| AUX_OBJ="setenv.o strcasecmp.o" NETGROUP= TLI= all |
| |
| # Unicos 8.x, Cray-YMP (Bruce Kelly). |
| unicos8: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=echo AR=bld ARFLAGS=rv \ |
| AUX_OBJ= NETGROUP= TLI= all |
| |
| # Power_UNIX 2.1.1 (amantel@lerc.nasa.gov) |
| power_unix_211: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lnsl -lsocket -lgen -lresolv" RANLIB=echo ARFLAGS=rv \ |
| NETGROUP= AUX_OBJ=setenv.o TLI=-DTLI BUGS="$(BUGS)" all |
| |
| # ISC (fc@all.net) |
| isc: |
| - make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + ${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-linet -lnsl_s -ldbm" RANLIB=echo ARFLAGS=rv \ |
| AUX_OBJ="setenv.o strcasecmp.o" EXTRA_CFLAGS="-DENOTCONN=ENAVAIL" \ |
| NETGROUP= TLI= all |
| |
| # Interactive UNIX R3.2 version 4.0 (Bobby D. Wright). |
| iunix: |
| - make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + ${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-linet -lnsl_s -ldbm" RANLIB=echo ARFLAGS=rv \ |
| AUX_OBJ=environ.o strcasecmp.o NETGROUP= TLI= all |
| |
| # RTU 6.0 on a Masscomp 5400 (ben@piglet.cr.usgs.gov). When using the |
| # advanced installation, increment argv before actually looking at it. |
| rtu: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=environ.o \ |
| NETGROUP= TLI= all |
| |
| # Unixware sans NIS (mc@telebase.com). Compiler dislikes strcasecmp.c. |
| unixware1: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl -lc -L/usr/ucblib -lucb" RANLIB=echo ARFLAGS=rv \ |
| NETGROUP=$(NETGROUP) AUX_OBJ=environ.o TLI=-DTLI all |
| |
| unixware2: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl -lgen -lc -L/usr/ucblib -lucb" RANLIB=echo \ |
| ARFLAGS=rv NETGROUP=$(NETGROUP) AUX_OBJ=environ.o TLI=-DTLI all |
| |
| u6000: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS="-lsocket -lnsl" RANLIB=echo ARFLAGS=rv \ |
| NETGROUP=-DNETGROUP AUX_OBJ="setenv.o strcasecmp.o" TLI=-DTLI all |
| |
| # MachTen |
| machten: |
| - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| + @${MAKE} REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=environ.o \ |
| NETGROUP= TLI= all |
| |
| @@ -680,10 +680,36 @@ |
| ## End configuration options |
| ############################ |
| |
| +SRCDIR = . |
| + |
| +DESTDIR = |
| + |
| +PREFIX = $(DESTDIR)/usr |
| + |
| +INCDIR = $(PREFIX)/include |
| + |
| +LIBDIR = $(PREFIX)/lib |
| + |
| +MANDIR = $(PREFIX)/share/man |
| +MAN3DIR = $(MANDIR)/man3 |
| +MAN5DIR = $(MANDIR)/man5 |
| +MAN8DIR = $(MANDIR)/man8 |
| + |
| +SBINDIR = $(PREFIX)/sbin |
| + |
| +INSTALL = install |
| +INSTALL_PROG = $(INSTALL) -m 0755 |
| +INSTALL_DATA = $(INSTALL) -m 0644 |
| + |
| +SYMLINK = ln -sf |
| + |
| +VPATH = $(SRCDIR) |
| + |
| # Protection against weird shells or weird make programs. |
| |
| SHELL = /bin/sh |
| -.c.o:; $(CC) $(CFLAGS) -o $*.o -c $*.c |
| + |
| +.c.o:; $(CC) $(CFLAGS) -o $*.o -c $(SRCDIR)/$*.c |
| |
| COPTS = -O2 -g |
| CFLAGS = $(COPTS) -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ |
| @@ -700,7 +726,8 @@ |
| |
| FROM_OBJ= fromhost.o |
| |
| -KIT = README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \ |
| +KIT = $(addprefix $(SRCDIR)/, \ |
| + README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \ |
| tcpd.h tcpdmatch.c Makefile hosts_access.5 strcasecmp.c BLURB rfc931.c \ |
| tcpd.8 eval.c hosts_access.3 hosts_ctl.c percent_x.c options.c \ |
| clean_exit.c environ.c patchlevel.h fix_options.c workarounds.c \ |
| @@ -709,7 +736,12 @@ |
| tli-sequent.h misc.c diag.c ncr.c tcpdchk.c percent_m.c \ |
| myvsyslog.c mystdarg.h printf.ck README.IRIX Banners.Makefile \ |
| refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \ |
| - scaffold.h tcpdmatch.8 README.NIS |
| + scaffold.h tcpdmatch.8 README.NIS) |
| + |
| +DOCS = $(addprefix $(SRCDIR)/,tcpd.8 tcpdchk.8 tcpdmatch.8 \ |
| + hosts_access.5 hosts_options.5) |
| + |
| +PROGS = tcpd tcpdmatch try-from safe_finger tcpdchk |
| |
| LIB = libwrap.a |
| |
| @@ -724,16 +756,16 @@ |
| SHLIBSO = shared/libwrap.so |
| SHLIBFLAGS = -Lshared -lwrap |
| |
| -SHLINKFLAGS = -fpic -shared -Wl,-soname,libwrap.so.$(SOMAJOR) -Wl,--version-script=libwrap.lds $(LIBS) |
| +SHLINKFLAGS = -fpic -shared -Wl,-soname,libwrap.so.$(SOMAJOR) -Wl,--version-script=$(SRCDIR)/libwrap.lds $(LIBS) |
| SHCFLAGS = -fpic -shared -D_REENTRANT |
| SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ)); |
| |
| -all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB) |
| +all other: config-check $(LIB) $(SHLIB) $(PROGS) |
| |
| # Invalidate all object files when the compiler options (CFLAGS) have changed. |
| |
| config-check: |
| - @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; } |
| + @set +e; test -n "$(REAL_DAEMON_DIR)" || { ${MAKE}; exit 1; } |
| @set +e; echo $(CFLAGS) >cflags.new ; \ |
| if cmp cflags cflags.new ; \ |
| then rm cflags.new ; \ |
| @@ -746,11 +778,11 @@ |
| $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ) |
| -$(RANLIB) $(LIB) |
| |
| -$(SHLIB): libwrap.lds $(SHLIB_OBJ) |
| +$(SHLIB): $(SRCDIR)/libwrap.lds $(SHLIB_OBJ) |
| rm -f $(SHLIB) |
| $(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ) |
| - ln -sf $(notdir $(SHLIB)) $(SHLIBSOMAJ) |
| - ln -sf $(notdir $(SHLIBSOMAJ)) $(SHLIBSO) |
| + $(SYMLINK) $(notdir $(SHLIB)) $(SHLIBSOMAJ) |
| + $(SYMLINK) $(notdir $(SHLIBSOMAJ)) $(SHLIBSO) |
| |
| tcpd: tcpd.o $(SHLIB) |
| $(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS) |
| @@ -774,6 +806,40 @@ |
| tcpdchk: $(TCPDCHK_OBJ) $(SHLIB) |
| $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS) |
| |
| +.PHONY: install install-lib install-bin install-doc install-dev |
| +install: install-lib install-bin install-doc install-dev |
| + |
| +$(LIBDIR) $(SBINDIR) $(MAN8DIR) $(MAN5DIR) $(MAN3DIR) $(INCDIR): |
| + mkdir -p $(@) |
| + |
| +install-lib: | $(LIBDIR) |
| + $(INSTALL_DATA) $(LIB) $(LIBDIR)/ |
| + $(INSTALL_PROG) $(SHLIB) $(LIBDIR)/ |
| + $(SYMLINK) $(notdir $(SHLIB)) $(LIBDIR)/$(notdir $(SHLIBSOMAJ)) |
| + $(SYMLINK) $(notdir $(SHLIBSOMAJ)) $(LIBDIR)/$(notdir $(SHLIBSO)) |
| + |
| +install-bin: | $(SBINDIR) |
| + $(INSTALL_PROG) tcpd $(SBINDIR)/ |
| + $(INSTALL_PROG) tcpdchk $(SBINDIR)/ |
| + $(INSTALL_PROG) tcpdmatch $(SBINDIR)/ |
| + $(INSTALL_PROG) try-from $(SBINDIR)/ |
| + $(INSTALL_PROG) safe_finger $(SBINDIR)/ |
| + |
| +install-doc: $(DOCS) | $(MAN5DIR) $(MAN8DIR) |
| + $(INSTALL_DATA) $(SRCDIR)/tcpd.8 $(MAN8DIR)/ |
| + $(INSTALL_DATA) $(SRCDIR)/tcpdchk.8 $(MAN8DIR)/ |
| + $(INSTALL_DATA) $(SRCDIR)/tcpdmatch.8 $(MAN8DIR)/ |
| + $(INSTALL_DATA) $(SRCDIR)/hosts_access.5 $(MAN5DIR)/ |
| + $(INSTALL_DATA) $(SRCDIR)/hosts_options.5 $(MAN5DIR)/ |
| + |
| +install-dev: | $(INCDIR) $(LIBDIR) $(MAN3DIR) |
| + $(INSTALL_DATA) $(SRCDIR)/hosts_access.3 $(MAN3DIR)/ |
| + $(INSTALL_DATA) $(SRCDIR)/tcpd.h $(INCDIR)/ |
| + $(INSTALL_DATA) $(LIB) $(LIBDIR)/ |
| + $(SYMLINK) $(SRCDIR)/hosts_access.3 $(MAN3DIR)/hosts_ctl.3 |
| + $(SYMLINK) $(SRCDIR)/hosts_access.3 $(MAN3DIR)/request_init.3 |
| + $(SYMLINK) $(SRCDIR)/hosts_access.3 $(MAN3DIR)/request_set.3 |
| + |
| shar: $(KIT) |
| @shar $(KIT) |
| |
| @@ -807,10 +873,11 @@ |
| -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) -DALWAYS_RFC931 \ |
| -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" \ |
| -Dvsyslog=myvsyslog \ |
| + $(addprefix $(SRCDIR)/, \ |
| tcpd.c fromhost.c socket.c tli.c hosts_access.c \ |
| shell_cmd.c refuse.c rfc931.c eval.c percent_x.c clean_exit.c \ |
| options.c setenv.c fix_options.c workarounds.c update.c misc.c \ |
| - diag.c myvsyslog.c percent_m.c |
| + diag.c myvsyslog.c percent_m.c) |
| |
| miscd_lint: |
| lint -DFACILITY=LOG_MAIL -DHOSTS_ACCESS -DPARANOID -DNETGROUP \ |
| @@ -819,43 +886,48 @@ |
| -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) -DALWAYS_RFC931 \ |
| -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" \ |
| -Dvsyslog=myvsyslog \ |
| + $(addprefix $(SRCDIR)/, \ |
| miscd.c fromhost.c socket.c tli.c hosts_access.c \ |
| shell_cmd.c refuse.c rfc931.c eval.c percent_x.c clean_exit.c \ |
| options.c setenv.c fix_options.c workarounds.c update.c misc.c \ |
| - diag.c myvsyslog.c percent_m.c |
| + diag.c myvsyslog.c percent_m.c) |
| |
| match_lint: |
| lint -DFACILITY=LOG_MAIL -DSEVERITY=$(SEVERITY) -DHOSTS_ACCESS \ |
| -DPARANOID $(TABLES) -DNETGROUP -DPROCESS_OPTIONS -DRFC931_TIMEOUT=10 \ |
| -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" \ |
| -Dvsyslog=myvsyslog \ |
| + $(addprefix $(SRCDIR)/, \ |
| tcpdmatch.c hosts_access.c eval.c percent_x.c options.c workarounds.c \ |
| update.c socket.c misc.c diag.c myvsyslog.c percent_m.c setenv.c \ |
| - inetcf.c scaffold.c |
| + inetcf.c scaffold.c) |
| |
| chk_lint: |
| lint -DFACILITY=LOG_MAIL -DSEVERITY=$(SEVERITY) -DHOSTS_ACCESS \ |
| -DPARANOID $(TABLES) -DNETGROUP -DPROCESS_OPTIONS -DRFC931_TIMEOUT=10 \ |
| -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" \ |
| -Dvsyslog=myvsyslog \ |
| + $(addprefix $(SRCDIR)/, \ |
| tcpdchk.c eval.c percent_x.c options.c update.c workarounds.c \ |
| - setenv.c misc.c diag.c myvsyslog.c percent_m.c inetcf.c scaffold.c |
| + setenv.c misc.c diag.c myvsyslog.c percent_m.c inetcf.c scaffold.c) |
| |
| printfck: |
| printfck -f printf.ck \ |
| + $(addprefix $(SRCDIR)/, \ |
| tcpd.c fromhost.c socket.c tli.c hosts_access.c \ |
| shell_cmd.c refuse.c rfc931.c eval.c percent_x.c clean_exit.c \ |
| options.c setenv.c fix_options.c workarounds.c update.c misc.c \ |
| - diag.c myvsyslog.c percent_m.c >aap.c |
| + diag.c myvsyslog.c percent_m.c) > aap.c |
| lint -DFACILITY=LOG_MAIL -DHOSTS_ACCESS -DPARANOID -DNETGROUP \ |
| -DGETPEERNAME_BUG -DDAEMON_UMASK=022 -DSEVERITY=$(SEVERITY) \ |
| $(TABLES) -DKILL_IP_OPTIONS -DPROCESS_OPTIONS \ |
| -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) -DALWAYS_RFC931 \ |
| -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" -Dvsyslog=myvsyslog aap.c |
| printfck -f printf.ck \ |
| + $(addprefix $(SRCDIR)/, \ |
| tcpdchk.c eval.c percent_x.c options.c update.c workarounds.c \ |
| - setenv.c misc.c diag.c myvsyslog.c percent_m.c inetcf.c scaffold.c \ |
| - >aap.c |
| + setenv.c misc.c diag.c myvsyslog.c percent_m.c inetcf.c scaffold.c) \ |
| + > aap.c |
| lint -DFACILITY=LOG_MAIL -DSEVERITY=$(SEVERITY) -DHOSTS_ACCESS \ |
| -DPARANOID $(TABLES) -DNETGROUP -DPROCESS_OPTIONS -DRFC931_TIMEOUT=10 \ |
| -Dvsyslog=myvsyslog -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" |
| @@ -863,79 +935,79 @@ |
| # Internal compilation dependencies. |
| |
| clean_exit.o: cflags |
| -clean_exit.o: tcpd.h |
| +clean_exit.o: $(SRCDIR)/tcpd.h |
| diag.o: cflags |
| -diag.o: mystdarg.h |
| -diag.o: tcpd.h |
| +diag.o: $(SRCDIR)/mystdarg.h |
| +diag.o: $(SRCDIR)/tcpd.h |
| environ.o: cflags |
| eval.o: cflags |
| -eval.o: tcpd.h |
| +eval.o: $(SRCDIR)/tcpd.h |
| fakelog.o: cflags |
| -fakelog.o: mystdarg.h |
| +fakelog.o: $(SRCDIR)/mystdarg.h |
| fix_options.o: cflags |
| -fix_options.o: tcpd.h |
| +fix_options.o: $(SRCDIR)/tcpd.h |
| fromhost.o: cflags |
| -fromhost.o: tcpd.h |
| +fromhost.o: $(SRCDIR)/tcpd.h |
| hosts_access.o: cflags |
| -hosts_access.o: tcpd.h |
| +hosts_access.o: $(SRCDIR)/tcpd.h |
| hosts_ctl.o: cflags |
| -hosts_ctl.o: tcpd.h |
| +hosts_ctl.o: $(SRCDIR)/tcpd.h |
| inetcf.o: cflags |
| -inetcf.o: inetcf.h |
| -inetcf.o: tcpd.h |
| +inetcf.o: $(SRCDIR)/inetcf.h |
| +inetcf.o: $(SRCDIR)/tcpd.h |
| misc.o: cflags |
| -misc.o: tcpd.h |
| +misc.o: $(SRCDIR)/tcpd.h |
| miscd.o: cflags |
| -miscd.o: patchlevel.h |
| -miscd.o: tcpd.h |
| +miscd.o: $(SRCDIR)/patchlevel.h |
| +miscd.o: $(SRCDIR)/tcpd.h |
| myvsyslog.o: cflags |
| -myvsyslog.o: mystdarg.h |
| -myvsyslog.o: tcpd.h |
| +myvsyslog.o: $(SRCDIR)/mystdarg.h |
| +myvsyslog.o: $(SRCDIR)/tcpd.h |
| ncr.o: cflags |
| -ncr.o: tcpd.h |
| +ncr.o: $(SRCDIR)/tcpd.h |
| options.o: cflags |
| -options.o: tcpd.h |
| +options.o: $(SRCDIR)/tcpd.h |
| percent_m.o: cflags |
| -percent_m.o: mystdarg.h |
| +percent_m.o: $(SRCDIR)/mystdarg.h |
| percent_x.o: cflags |
| -percent_x.o: tcpd.h |
| +percent_x.o: $(SRCDIR)/tcpd.h |
| ptx.o: cflags |
| -ptx.o: tcpd.h |
| +ptx.o: $(SRCDIR)/tcpd.h |
| refuse.o: cflags |
| -refuse.o: tcpd.h |
| +refuse.o: $(SRCDIR)/tcpd.h |
| rfc931.o: cflags |
| -rfc931.o: tcpd.h |
| +rfc931.o: $(SRCDIR)/tcpd.h |
| safe_finger.o: cflags |
| scaffold.o: cflags |
| -scaffold.o: scaffold.h |
| -scaffold.o: tcpd.h |
| +scaffold.o: $(SRCDIR)/scaffold.h |
| +scaffold.o: $(SRCDIR)/tcpd.h |
| setenv.o: cflags |
| shell_cmd.o: cflags |
| -shell_cmd.o: tcpd.h |
| +shell_cmd.o: $(SRCDIR)/tcpd.h |
| socket.o: cflags |
| -socket.o: tcpd.h |
| +socket.o: $(SRCDIR)/tcpd.h |
| strcasecmp.o: cflags |
| tcpd.o: cflags |
| -tcpd.o: patchlevel.h |
| -tcpd.o: tcpd.h |
| +tcpd.o: $(SRCDIR)/patchlevel.h |
| +tcpd.o: $(SRCDIR)/tcpd.h |
| tcpdchk.o: cflags |
| -tcpdchk.o: inetcf.h |
| -tcpdchk.o: scaffold.h |
| -tcpdchk.o: tcpd.h |
| +tcpdchk.o: $(SRCDIR)/inetcf.h |
| +tcpdchk.o: $(SRCDIR)/scaffold.h |
| +tcpdchk.o: $(SRCDIR)/tcpd.h |
| tcpdmatch.o: cflags |
| -tcpdmatch.o: scaffold.h |
| -tcpdmatch.o: tcpd.h |
| +tcpdmatch.o: $(SRCDIR)/scaffold.h |
| +tcpdmatch.o: $(SRCDIR)/tcpd.h |
| tli-sequent.o: cflags |
| -tli-sequent.o: tcpd.h |
| -tli-sequent.o: tli-sequent.h |
| +tli-sequent.o: $(SRCDIR)/tcpd.h |
| +tli-sequent.o: $(SRCDIR)/tli-sequent.h |
| tli.o: cflags |
| -tli.o: tcpd.h |
| +tli.o: $(SRCDIR)/tcpd.h |
| try-from.o: cflags |
| -try-from.o: tcpd.h |
| +try-from.o: $(SRCDIR)/tcpd.h |
| update.o: cflags |
| -update.o: mystdarg.h |
| -update.o: tcpd.h |
| +update.o: $(SRCDIR)/mystdarg.h |
| +update.o: $(SRCDIR)/tcpd.h |
| vfprintf.o: cflags |
| -weak_symbols.o: tcpd.h |
| +weak_symbols.o: $(SRCDIR)/tcpd.h |
| workarounds.o: cflags |
| -workarounds.o: tcpd.h |
| +workarounds.o: $(SRCDIR)/tcpd.h |
