diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-11 06:34:39 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-11 06:34:39 +0000 |
| commit | 972c1774be3d993938c67ba51c2b0d7b70b8d25e (patch) | |
| tree | 7ebba55939f16944710d3592b77aa5484c2c4ab8 /comms/conserver/files/patch-aa | |
| parent | - Support CXX/CXXFLAGS propelry (diff) | |
Make PREFIX clean and respect CFLAGS.
PR: 21365
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to '')
| -rw-r--r-- | comms/conserver/files/patch-aa | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/comms/conserver/files/patch-aa b/comms/conserver/files/patch-aa index 0339df37af75..7f3e11bd8b38 100644 --- a/comms/conserver/files/patch-aa +++ b/comms/conserver/files/patch-aa @@ -1,33 +1,46 @@ ---- conserver/Makefile.orig Sat Nov 22 20:42:18 1997 -+++ conserver/Makefile Sat Nov 22 20:43:24 1997 -@@ -8,6 +8,6 @@ +--- conserver/Makefile.orig Fri Nov 10 22:22:39 2000 ++++ conserver/Makefile Fri Nov 10 22:26:14 2000 +@@ -7,8 +7,9 @@ + # (1) change ETC below to where you would like the console server installed # I would not change the name, you have to much with the docs then... PROG= conserver -ETC= ${DESTDIR}/usr/local/etc -DOC= ${DESTDIR}/usr/local/man +ETC= ${PREFIX}/sbin +DOC= ${PREFIX}/man/man8 ++CONFIG= ${PREFIX}/etc/conserver.cf # if we have to PUCC ptyd daemon we can use it to get ptys, else use fallback.o -@@ -25,5 +25,5 @@ + # and change the CDEFS line below to =0 +@@ -23,9 +24,9 @@ + P= + INCLUDE= - DEBUG=-O +-DEBUG=-O -CDEFS= -DSUN5 -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -+CDEFS= -DFREEBSD -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782 - CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE} +-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE} ++#DEBUG=-O ++CDEFS= -DFREEBSD -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782 -DCONFIG=\"${CONFIG}\" ++CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE} -@@ -42,5 +42,5 @@ + HDR= cons.h \ + access.h client.h consent.h group.h main.h master.h \ +@@ -41,7 +42,7 @@ + all: ${PROG} ${PROG}:$P ${OBJ} - ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lsocket -lnsl + ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lcrypt clean: FRC -@@ -60,5 +60,6 @@ + rm -f Makefile.bak ${PROG} a.out *.o core errs lint.out tags +@@ -59,7 +60,8 @@ + distrib -c ${ETC}/${PROG} install: all dirs FRC - install -c -s ${PROG} ${ETC}/${PROG} -+ install -c -s -o bin -g bin -m 555 ${PROG} ${ETC}/${PROG} -+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/conserver.8 ++ ${BSD_INSTALL_PROGRAM} ${PROG} ${ETC}/${PROG} ++ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/conserver.8 lint: ${HDR} ${SRC} FRC + lint -h ${CDEFS} ${INCLUDE} ${SRC} |