diff options
author | ru <ru@FreeBSD.org> | 2004-02-13 21:52:08 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2004-02-13 21:52:08 +0000 |
commit | 351edd655e4ba2fc917cd1abc7498731284e292b (patch) | |
tree | 9dc29d794ffc82615c9bc2add372eb4748528aff /Makefile.inc1 | |
parent | 3a8e26fe33ba29f5a8dcc4d3480ae8c8427f42e3 (diff) | |
download | FreeBSD-src-351edd655e4ba2fc917cd1abc7498731284e292b.zip FreeBSD-src-351edd655e4ba2fc917cd1abc7498731284e292b.tar.gz |
Drop directory existence checks.
OK'ed by: bde
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 86 |
1 files changed, 24 insertions, 62 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index fdee6a0..b13602e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -33,80 +33,44 @@ # /usr/share/mk. These include: # obj depend all install clean cleandepend cleanobj -# Put initial settings here. -SUBDIR= - # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. -.if exists(${.CURDIR}/share/info) -SUBDIR+= share/info -.endif - -.if exists(${.CURDIR}/include) -SUBDIR+= include -.endif - +# # We must do lib and libexec before bin, because if installworld # installs a new /bin/sh, the 'make' command will *immediately* # use that new version. And the new (dynamically-linked) /bin/sh # will expect to find appropriate libraries in /lib and /libexec. -.if exists(${.CURDIR}/lib) -SUBDIR+= lib -.endif -.if exists(${.CURDIR}/libexec) -SUBDIR+= libexec -.endif - -.if exists(${.CURDIR}/bin) -SUBDIR+= bin -.endif -.if exists(${.CURDIR}/games) && !defined(NOGAMES) -SUBDIR+= games -.endif -.if exists(${.CURDIR}/gnu) -SUBDIR+= gnu -.endif -.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) -SUBDIR+= kerberos5 -.endif -.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) -SUBDIR+= rescue -.endif -.if exists(${.CURDIR}/sbin) -SUBDIR+= sbin -.endif -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) -SUBDIR+= secure -.endif -.if exists(${.CURDIR}/share) && !defined(NOSHARE) -SUBDIR+= share +# +# We must do etc last for install/distribute to work. +# +SUBDIR= share/info include lib libexec bin +.if !defined(NOGAMES) +SUBDIR+=games .endif -.if exists(${.CURDIR}/sys) -SUBDIR+= sys +SUBDIR+=gnu +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +SUBDIR+=kerberos5 .endif -.if exists(${.CURDIR}/usr.bin) -SUBDIR+= usr.bin +.if !defined(NO_RESCUE) +SUBDIR+=rescue .endif -.if exists(${.CURDIR}/usr.sbin) -SUBDIR+= usr.sbin +SUBDIR+=sbin +.if !defined(NOCRYPT) +SUBDIR+=secure .endif - -# etc must be last for install/distribute to work -.if exists(${.CURDIR}/etc) -SUBDIR+= etc +.if !defined(NOSHARE) +SUBDIR+=share .endif +SUBDIR+=sys usr.bin usr.sbin etc # These are last, since it is nice to at least get the base system # rebuilt before you do them. -.if defined(LOCAL_DIRS) .for _DIR in ${LOCAL_DIRS} -.if exists(${.CURDIR}/${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile) +.if exists(${.CURDIR}/${_DIR}/Makefile) SUBDIR+= ${_DIR} .endif .endfor -.endif .if defined(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} @@ -610,7 +574,7 @@ legacy: # # bootstrap-tools: Build tools needed for compatibility # -.if exists(${.CURDIR}/games) && !defined(NOGAMES) +.if !defined(NOGAMES) _strfile= games/fortune/strfile .endif @@ -688,7 +652,7 @@ bootstrap-tools: _aicasm= sys/modules/aic7xxx/aicasm .endif -.if exists(${.CURDIR}/share) && !defined(NOSHARE) +.if !defined(NOSHARE) _share= share/syscons/scrnmaps .endif @@ -696,12 +660,11 @@ _share= share/syscons/scrnmaps _fortran= gnu/usr.bin/cc/f771 .endif -.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) _kerberos5_tools= kerberos5/tools .endif -.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) +.if !defined(NO_RESCUE) _rescue= rescue/rescue .endif @@ -812,8 +775,7 @@ _prebuild_libs= _generic_libs= gnu/lib -.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 |