diff options
| -rw-r--r-- | Makefile.inc1 | 6 | ||||
| -rw-r--r-- | share/info/Makefile | 22 | ||||
| -rw-r--r-- | share/info/dir-tmpl | 16 |
3 files changed, 1 insertions, 43 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 826c05f7f21af..bbae094c3ba95 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -50,10 +50,6 @@ .include <bsd.arch.inc.mk> .include <bsd.compiler.mk> -# 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. -# # 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 @@ -63,7 +59,7 @@ SRCDIR?= ${.CURDIR} .if defined(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} .else -SUBDIR= share/info lib libexec +SUBDIR= lib libexec SUBDIR+=bin .if ${MK_GAMES} != "no" SUBDIR+=games diff --git a/share/info/Makefile b/share/info/Makefile deleted file mode 100644 index 6c09adb5ce438..0000000000000 --- a/share/info/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD$ - -NO_OBJ= - -.include <bsd.prog.mk> - -beforeinstall: -.if !exists(${DESTDIR}${INFODIR}) - @echo "Warning: the directory ${DESTDIR}${INFODIR} does not exist!" - @echo "Perhaps the variable INFODIR is set incorrectly" - @echo "or your mtree database files are broken." - @echo "" - @echo "As a workaround you can create the directory by hand, e.g.:" - @echo -n "install -d -o ${INFOOWN} -g ${INFOGRP} " - @echo "-m 0755 ${DESTDIR}${INFODIR}" - @exit 3; -.endif -.if !exists(${DESTDIR}${INFODIR}/dir) - ${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m 644 \ - dir-tmpl ${DESTDIR}${INFODIR}/dir -.endif diff --git a/share/info/dir-tmpl b/share/info/dir-tmpl deleted file mode 100644 index 6064d3aa076cb..0000000000000 --- a/share/info/dir-tmpl +++ /dev/null @@ -1,16 +0,0 @@ --*- Text -*- -This is the file .../info/dir, which contains the -topmost node of the Info hierarchy, called (dir)Top. -The first time you invoke Info you start off looking at this node. - -File: dir, Node: Top This is the top of the INFO tree - - This (the Directory node) gives a menu of major topics. - Typing "q" exits, "?" lists all Info commands, "d" returns here, - "h" gives a primer for first-timers, - "mEmacs<Return>" visits the Emacs manual, etc. - - In Emacs, you can click mouse button 2 on a menu item or cross reference - to select it. - -* Menu: |