Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#define _PATH_BIN_RCMD in common_source/pathnames.h rather than using

Browse Source 
wacky Makefile rules to compile rcmd.c
This commit is contained in:
lukem 2003-10-19 05:51:44 +00:00
parent 8545f3b03c
commit eae82b3d06
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/lpr/common_source/pathnames.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pathnames.h,v 1.7 2003/08/07 11:25:25 agc Exp $ */ /* $NetBSD: pathnames.h,v 1.8 2003/10/19 05:51:44 lukem Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -46,3 +46,6 @@
#define _PATH_VFONTI "/usr/libdata/vfont/I" #define _PATH_VFONTI "/usr/libdata/vfont/I"
#define _PATH_VFONTR "/usr/libdata/vfont/R" #define _PATH_VFONTR "/usr/libdata/vfont/R"
#define _PATH_VFONTS "/usr/libdata/vfont/S" #define _PATH_VFONTS "/usr/libdata/vfont/S"
/* from lib/libc/include/pathnames.h, for rcmd.c */
#define _PATH_BIN_RCMD "/bin/rcmd"

8
usr.sbin/lpr/lpd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 2002/09/18 03:54:33 lukem Exp $ # $NetBSD: Makefile,v 1.17 2003/10/19 05:51:44 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93 # @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk> .include <bsd.own.mk>
@ -11,11 +11,7 @@ CPPFLAGS+=-DLIBWRAP
LDADD+= -lwrap LDADD+= -lwrap
DPADD+= ${LIBWRAP} DPADD+= ${LIBWRAP}
# the ugly hack is to correctly include lib/libc/include/pathnames.h, CPPFLAGS.rcmd.c= -DINET6
# not usr.sbin/lpr/common_source/pathnames.h
rcmd.o: rcmd.c
${CC} ${CFLAGS} -I${NETBSDSRCDIR}/lib/libc/include -DINET6 \
${CPPFLAGS} -c ${.IMPSRC}
.PATH: ${NETBSDSRCDIR}/lib/libc/net .PATH: ${NETBSDSRCDIR}/lib/libc/net