diff options
| author | ru <ru@FreeBSD.org> | 2000-01-19 19:18:50 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2000-01-19 19:18:50 +0000 |
| commit | 1ac5a2b5a097eba5e809905e4d8157c36685c61b (patch) | |
| tree | 5666a9ba9110d00feec3c840c5d9d30d412fb916 /share | |
| parent | 28f55e3f8e60b6cedb005e86c571bd8dca4ccbc4 (diff) | |
| download | FreeBSD-src-1ac5a2b5a097eba5e809905e4d8157c36685c61b.zip FreeBSD-src-1ac5a2b5a097eba5e809905e4d8157c36685c61b.tar.gz | |
New install-info(1) correctly fails to install ENTRY for file FOO
if ENTRY already exists for file FOO2 in /usr/share/info/dir.
So, re-init /usr/share/info/dir unconditionally at installworld.
Diffstat (limited to 'share')
| -rw-r--r-- | share/Makefile | 4 | ||||
| -rw-r--r-- | share/info/Makefile | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/share/Makefile b/share/Makefile index f7f5ef1..fa7c5f9 100644 --- a/share/Makefile +++ b/share/Makefile @@ -1,7 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -SUBDIR= colldef dict doc examples info isdn man me misc mk mklocale skel \ +# Do not include `info' in the SUBDIR list, it is handled separately. + +SUBDIR= colldef dict doc examples isdn man me misc mk mklocale skel \ syscons tabset termcap timedef zoneinfo .include <bsd.subdir.mk> diff --git a/share/info/Makefile b/share/info/Makefile index 7502e3a..f4ac782 100644 --- a/share/info/Makefile +++ b/share/info/Makefile @@ -3,8 +3,6 @@ NOOBJ= noobj -all clean cleandir depend lint tags: - beforeinstall: .if !exists(${DESTDIR}${INFODIR}) @echo "Warning: the directory ${DESTDIR}${INFODIR} does not exist!" @@ -18,9 +16,7 @@ beforeinstall: .endif ${INSTALL} -c -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} dir-tmpl \ ${DESTDIR}${INFODIR}/dir-tmpl -.if !exists(${DESTDIR}${INFODIR}/dir) ${INSTALL} -c -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ dir-tmpl ${DESTDIR}${INFODIR}/dir -.endif .include <bsd.prog.mk> |
