diff options
Diffstat (limited to 'bin/csh')
| -rw-r--r-- | bin/csh/Makefile | 24 | ||||
| -rw-r--r-- | bin/csh/Makefile.depend | 5 | ||||
| -rw-r--r-- | bin/csh/config.h | 1 | ||||
| -rw-r--r-- | bin/csh/config_p.h | 1 | ||||
| -rw-r--r-- | bin/csh/csh.cshrc | 1 | ||||
| -rw-r--r-- | bin/csh/csh.login | 1 | ||||
| -rw-r--r-- | bin/csh/csh.logout | 1 | ||||
| -rw-r--r-- | bin/csh/dot.cshrc | 1 | ||||
| -rw-r--r-- | bin/csh/dot.login | 1 | ||||
| -rw-r--r-- | bin/csh/iconv_stub.c | 2 | ||||
| -rw-r--r-- | bin/csh/iconv_stub.h | 2 |
11 files changed, 14 insertions, 26 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 2281c11538d0..5cbb58bd0ead 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -1,6 +1,3 @@ -# $FreeBSD$ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 -# # C Shell with process control; VM/UNIX VAX Makefile # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria # @@ -16,6 +13,7 @@ ROOTPACKAGE= csh ETC= csh.cshrc csh.login csh.logout ROOT= dot.cshrc dot.login ROOTDIR= /root +ROOTDIR_MODE= 0750 ROOTNAME_dot.cshrc= .cshrc ROOTNAME_dot.login= .login TCSHDIR= ${SRCTOP}/contrib/tcsh @@ -118,15 +116,23 @@ NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charse csh.1: tcsh.man cat ${.ALLSRC} > ${.TARGET} +.if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no" build-tools: gethost +tc.defs.c: gethost DEPENDOBJS+= gethost -gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META} +gethost: gethost.c sh.err.h sh.h ${BUILD_TOOLS_META} @rm -f ${.TARGET} - ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ + # Define _h_tc_const so that tc.h will skip including tc.const.h. + # gethost.c does not actually require any of the definitions in there, + # and building tc.const.h requires target headers which are not + # available when we need to build gethost. + ${HOST_CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ + -D_h_tc_const \ ${TCSHDIR}/gethost.c +.endif -tc.defs.c: gethost ${TCSHDIR}/host.defs +tc.defs.c: ${TCSHDIR}/host.defs @rm -f ${.TARGET} @echo "/* Do not edit this file, make creates it */" > ${.TARGET} ${BTOOLSPATH:U.}/gethost ${TCSHDIR}/host.defs >> ${.TARGET} @@ -158,10 +164,4 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h ${BUILD sort >> ${.TARGET} @echo '#endif /* _h_tc_const */' >> ${.TARGET} -beforeinstallconfig: - rm -f ${DESTDIR}/.cshrc - -afterinstallconfig: - ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc - .include <bsd.prog.mk> diff --git a/bin/csh/Makefile.depend b/bin/csh/Makefile.depend index 05f33d1d7799..604ca4ffe0ea 100644 --- a/bin/csh/Makefile.depend +++ b/bin/csh/Makefile.depend @@ -1,8 +1,7 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ + bin/csh.host \ include \ include/arpa \ include/xlocale \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ - lib/ncurses/ncursesw \ + lib/ncurses/tinfo \ .include <dirdeps.mk> diff --git a/bin/csh/config.h b/bin/csh/config.h index 103ceb604062..6705cc58f5bd 100644 --- a/bin/csh/config.h +++ b/bin/csh/config.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h index c25e87a903ea..8b7ecd20de19 100644 --- a/bin/csh/config_p.h +++ b/bin/csh/config_p.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* * config.h -- configure various defines for tcsh * diff --git a/bin/csh/csh.cshrc b/bin/csh/csh.cshrc index f4f775ae6ada..b08603404cf9 100644 --- a/bin/csh/csh.cshrc +++ b/bin/csh/csh.cshrc @@ -1,3 +1,2 @@ -# $FreeBSD$ # # System-wide .cshrc file for csh(1). diff --git a/bin/csh/csh.login b/bin/csh/csh.login index b55ae087590a..ec1b70451236 100644 --- a/bin/csh/csh.login +++ b/bin/csh/csh.login @@ -1,4 +1,3 @@ -# $FreeBSD$ # # System-wide .login file for csh(1). # diff --git a/bin/csh/csh.logout b/bin/csh/csh.logout index 6b0584f49984..73103d8096d8 100644 --- a/bin/csh/csh.logout +++ b/bin/csh/csh.logout @@ -1,3 +1,2 @@ -# $FreeBSD$ # # System-wide .logout file for csh(1). diff --git a/bin/csh/dot.cshrc b/bin/csh/dot.cshrc index 2465cf42da6c..3d1ddb094c72 100644 --- a/bin/csh/dot.cshrc +++ b/bin/csh/dot.cshrc @@ -1,4 +1,3 @@ -# $FreeBSD$ # # .cshrc - csh resource script, read at beginning of execution by each shell # diff --git a/bin/csh/dot.login b/bin/csh/dot.login index 8d87604f4f7d..a18fc8c78001 100644 --- a/bin/csh/dot.login +++ b/bin/csh/dot.login @@ -1,4 +1,3 @@ -# $FreeBSD$ # # .login - csh login script, read by login shell, after `.cshrc' at login. # diff --git a/bin/csh/iconv_stub.c b/bin/csh/iconv_stub.c index e20608c60616..67659d9f20a3 100644 --- a/bin/csh/iconv_stub.c +++ b/bin/csh/iconv_stub.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dlfcn.h> diff --git a/bin/csh/iconv_stub.h b/bin/csh/iconv_stub.h index a3e069a06e31..d85bcf3b113b 100644 --- a/bin/csh/iconv_stub.h +++ b/bin/csh/iconv_stub.h @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _ICONV_H_ |