diff options
author | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
commit | a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82 (patch) | |
tree | 71acee51f11c433be4c4a51635ce1ea4302ca4b6 /include | |
parent | 54cf5d1b6607c1e6f2cbf32784c33720517bce49 (diff) | |
parent | 3bc7f4d78d27696df85e118c07aa5a2630188922 (diff) | |
download | FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.zip FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'include')
-rw-r--r-- | include/Makefile | 1 | ||||
-rwxr-xr-x | include/mk-osreldate.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/Makefile b/include/Makefile index 09b4080..1c2bf39 100644 --- a/include/Makefile +++ b/include/Makefile @@ -7,6 +7,7 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc xlocale +SUBDIR_PARALLEL= INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ diff --git a/include/mk-osreldate.sh b/include/mk-osreldate.sh index 239a661..ed8311c 100755 --- a/include/mk-osreldate.sh +++ b/include/mk-osreldate.sh @@ -49,4 +49,4 @@ $COPYRIGHT #endif EOF chmod 644 $tmpfile -mv $tmpfile osreldate.h +mv -f $tmpfile osreldate.h |