$NetBSD: patch-aa,v 1.1.1.1 2005/11/06 23:58:34 jlam Exp $ --- Makefile.orig 1998-10-28 15:30:03.000000000 -0500 +++ Makefile @@ -17,10 +17,10 @@ # You probably want to change this: #INSTROOT = ${HOME} -INSTROOT = /depot/collections0/netpipes4.1 -#INSTROOT = /usr/local +#INSTROOT = /depot/collections0/netpipes4.1 +INSTROOT = ${PREFIX} INSTBIN = ${INSTROOT}/bin -INSTMAN = ${INSTROOT}/man +INSTMAN = ${INSTROOT}/${PKGMANDIR} # For those who wish to use gcc instead of the vendor's compiler. #CC=gcc -Wall @@ -35,6 +35,8 @@ INSTMAN = ${INSTROOT}/man # Also necessary for SCO #LDLIBS=-lsocket -lnsl +LDLIBS=${LIBS} + ###################################################################### # CFLAGS ###################################################################### @@ -59,7 +61,7 @@ INSTMAN = ${INSTROOT}/man #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS) # Linux (developed with RedHat 4.2, libc5) -CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS) +#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS) # SGI #CFLAGS = -DSYSV $(CDEBUGFLAGS) @@ -86,7 +88,7 @@ CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_ # gcc can handle both -O and -g at once #CDEBUGFLAGS = -g # -Wall -DDEBUG -CDEBUGFLAGS = -O +#CDEBUGFLAGS = -O ###################################################################### @@ -104,8 +106,7 @@ SSLINC = -I${SSLDIR}/include SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto MANPAGES = netpipes.1 faucet.1 hose.1 \ - sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \ - ssl-auth.1 + sockdown.1 getpeername.1 timelimit.1 encapsulate.1 PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate all : ${PROGRAMS} @@ -140,13 +141,13 @@ ssl-criteria.o: ssl-criteria.c install : all test -d ${INSTROOT} || mkdir ${INSTROOT} test -d ${INSTBIN} || mkdir ${INSTBIN} - cp ${PROGRAMS} ${INSTBIN}/ + ${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${INSTBIN}/ - rm -f ${INSTBIN}/getsockname ln -s getpeername ${INSTBIN}/getsockname - [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/ test -d ${INSTMAN} || mkdir ${INSTMAN} test -d ${INSTMAN}/man1 || mkdir ${INSTMAN}/man1 - cp ${MANPAGES} ${INSTMAN}/man1/ + ${BSD_INSTALL_MAN} ${MANPAGES} ${INSTMAN}/man1/ #