Commit Graph

57 Commits

Author SHA1 Message Date
ru
1cb869c043 o Use --defsection and --defentry options of install-info(1) instead of
"fancy substitutions".
o Invoke install-info(1) with --quiet to automatically remove duplicate
  Info dir entries.

Reviewed by:	bde
2000-01-24 16:11:19 +00:00
peter
76f0c923fe $Id$ -> $FreeBSD$ 1999-08-28 00:22:10 +00:00
bde
d4cadee8f4 Rewrote the changes in rev.1.53. Don't ignore errors from makeinfo.
Use fancy substitutions instead of a huge if statement to handle the
rather delicate quoting.
1999-01-30 14:28:10 +00:00
ache
801f1c1fa1 remove - before __entry, it is not make conmmand but shell continuation line 1999-01-20 17:22:11 +00:00
markm
0b91534f2d Texinfo has been upgraded. This needs to catch up.
Submitted by:	lkoeller@cc.fh-lippe.de
1999-01-20 05:48:19 +00:00
markm
ae54195e61 Option names have changes for texinfo-3.12 1999-01-14 20:02:41 +00:00
peter
912ec94d68 Make ../Makefile.inc handling more consistant to prevent multiple includes
when certain .mk files include other .mk files.  This will remove the
need for multiple include protection in some other makefiles around the
tree (and helps some elf conditionals).
1998-08-08 07:02:08 +00:00
bde
719d62b3b0 Only include bsd.dep.mk in `mk'files that handle C sources. Abuse
bsd.obj.mk instead of bsd.dep.mk for defining the _SUBDIR target
and a default tags target.  Abuse bsd.obj.mk for defining default
cleandepend and depend targets.
1998-05-06 18:44:04 +00:00
eivind
4e506c209b Introduce the 'regress' target.
Silently approved by:	-hackers, -current
1998-03-12 20:02:17 +00:00
jkh
e7557f392f DISTRIBUTION is bin (we'll make the info dist another way). 1997-12-26 00:19:23 +00:00
bde
4b659b30c1 Removed gross dir file bootstrap rule again. It would break building
when there is no /usr/src/share/info if it were actually used.

Added comments to explain duplicated tex commands.

Use substitution in IFILENS to simplify some things.

Removed /g from many substitutions.  It is bogus for anchored matches.

Don't echo nothing.

Don't add things that wouldn't be built with the current options to
CLEANFILES (except for some cases involving tex).
Reviewed by:	wosch
1997-12-16 18:29:48 +00:00
wosch
e736d68c30 Remove the comments hat just list the nested includes.
The lists don't provide significantly more information than
grep '\.include', and grep gives lists that are actually correct.
Submitted by: Bruce
1997-11-09 15:03:15 +00:00
wosch
3ddcf87422 Support output format html.
Add make variables INFO2HTML, TEX, DVIPS, DVIPS2ASCII.
1997-10-12 18:54:34 +00:00
wosch
a14e4dea11 Do not use an intermediate file. The intermediate filename will go
into the info output which may breaks other programs (e.g. info2html).
1997-10-11 17:30:18 +00:00
wosch
0145bd0653 Bugfix for rev 1.41:
makeinfo does not understand the tex command \input
1997-10-09 18:14:18 +00:00
wosch
e772f46053 Delete redundant entries.
Run tex twice due cross references.
Cleanup many tex generated files in `make clean'
Format latin1 output in 80 characters column (was ~110 characters).
1997-10-04 13:00:56 +00:00
wosch
e4a3982a6e Support output formats dvi, ps, latin1. 1997-10-01 21:35:14 +00:00
jkh
a8bb7ab7de Change the distribute targets so that a given item in our source tree
can place itself into n distributions, where n >= 1.
1997-06-21 15:40:34 +00:00
jkh
1196bc34a5 Put the "grossness" back; it had a purpose and anyone screwing around
with these files MUST understand what a `make release' does before
making changes like this or get nasty-grams from me when my builds start
falling over.  In fact, if they can't test "make release" after making
such changes then they *should leave these files completely alone*.
Thank you.
1997-05-01 01:15:55 +00:00
bde
d3610b6412 Oops. The previous change duplicated the grossness instead of removing it. 1997-04-30 17:03:09 +00:00
bde
335b2fc8d1 Removed gross dir file bootstrap rule. Keep depending on the dir
file so that we fail if it isn't already installed.  The bootstrap
is now done by `make install' in the top-level src directory.  As
well as being gross, the rule didn't actually work for src trees
other than /usr/src, and this is difficult to fix since the whole
src tree may not exist.
1997-04-30 16:33:43 +00:00
bde
8d6ed2803c Include ${CURDIR}/../Makefile.inc as in most other `.mk' files. This
is most useful for centralizing the definitions of paths to contrib
directories.

Removed useless subshell and evil-hiding @ in the the rule for
initializing the info dir.
1997-04-07 16:46:40 +00:00
peter
a0b5b4259e Fix some bugs from bde's list (long lines) 1997-03-29 12:39:52 +00:00
peter
9694f2119f makeinfo can fail but still leave behind zero length files which cause
interesting problems because the resulting file is newer than the source
and this stops 'make' from rebuilding it.  Go via an intermediate file
and rename to make sure this doesn't happen.
1997-03-12 07:14:44 +00:00
peter
abe22e551b Move the conditional declarations of ICOMPRESS_CMD and ICOMPRESS_EXT
to before they are used in .for loops and .SUFFIXES lists, or it
doesn't work!  Without this, 'make all' doesn't gzip the result as the
generated 'all' target doesn't seem to be defined completely.
1997-03-12 06:24:52 +00:00
wosch
b3214dac27 Add new variables COMPRESS_CMD and COMPRESS_EXT.
bsd.doc.mk:
	rename GZIPCMD to DCOMPRESS_CMD, add DCOMPRESS_EXT
bsd.info.mk:
	rename GZIPCMD to ICOMPRESS_CMD, add ICOMPRESS_EXT
	set INFOTMPL to ${INFODIR}/dir-tmpl
bsd.man.mk
	rename ZEXTENSION to MCOMPRESS_EXT, MCOMPRESS to MCOMPRESS_CMD
1997-03-08 23:46:56 +00:00
peter
83b3c2c161 Revert $FreeBSD$ to $Id$ 1997-02-22 14:13:04 +00:00
wosch
b05b74ee7b Move gzip(1) option -c from commandline into variable GZIPCMD. Not
all compress programs (e.g. cat(1)) support the option -c.
1997-01-14 11:59:33 +00:00
jkh
808a36ef65 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
jkh
058c86d9e8 Make sure dir file exists before we call install-info, which requires it.
Sorry, I know it's a gross fix to call share/info's install target as
a side-effect, but that's less gross than propagating the work-around
changes to files which have nothing to do with the info system.
1997-01-13 23:44:20 +00:00
wosch
ae3d37ac7b Add comments about variables and targets. Incomplete, see '???'. 1997-01-12 16:20:13 +00:00
peter
652ab90776 one more tweak to make it fly without INFO defined. (like bsd.prog.mk) 1997-01-12 07:30:23 +00:00
peter
b4dfa9cba3 oops, missed a ${BINDIR} -> ${INFODIR}. Also remove the slash between
${DESTDIR}/${INFODIR}.
1997-01-12 07:15:24 +00:00
peter
37d72f4be9 recover spammed revisions 1.20 and 1.21. This fixes the breaks in the
builds when INFO is commented out.

Pointed out by: bde
1997-01-12 07:05:07 +00:00
jmacd
6984bfb217 In an attempt to make the new info rules bootstrap themselves, make
the rules conditional on NOINFO not being defined, just like NOMAN.
1997-01-11 10:51:36 +00:00
jmacd
c33ba3cc46 Change the installation rules. It now copies an empty dir file
into the DESTDIR in the beforeinstall rule in src/share/info/Makefile.
Then each info file that gets installed into the dir file using
install-info.

It has struck me that there's going to be a problem bootstrapping
this change, since parts of install will fail until install-info
is installed.  Maybe someone who knows best how to deal with this can
fix it.
1997-01-11 02:39:37 +00:00
ache
e881a25a8e FIx typing error .SRCDIR -> SRCDIR
Submitted by:  bde
1997-01-06 02:30:13 +00:00
ache
ad809aa5ff Use SRCDIR to handle non-current directory docs
Use INFO* macros from bsd.own.mk
1997-01-05 15:33:36 +00:00
bde
f604ccac59 BSD.usr.dist:
Added forgotten share/doc/psd/05.sysman and share/zoneinfo/America/Indiana.

bsd.doc.mk:
Nuked mkdir -p and wrong fixups of the leaf directory's ownerships and
permissions.  The doc tree should be well enough established for this
to be safe.  Installs to directories should use a trailing slash on
the directory name so installs to non-drectories are fatal, but I
didn't start changing them.

bsd.man.mk:
Nuked mkdir -p and wrong fixups of the leaf directory's ownerships and
permissions.  They were overkill to create just /usr/share/info.

zoneinfo/Makefile:
No changes yet.  zic creates directories with ordinary 755 permissions.
Why do we use 555 permissions for directories in /usr/share/zoninfo.
Why not for zoneinfo itself?  /proc and /dev/fd are the only other
directories in the system with 555 permissions.
1996-09-03 15:14:45 +00:00
jkh
8eb37231d4 Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src.  This is the final version of the
patches, incorporating the feedback I've received from -current.
1996-06-24 04:26:21 +00:00
wosch
8eea1d0d90 [Ee]rrs -> Errs errs
save one process for make clean
1996-03-07 23:39:46 +00:00
mpp
380c7bb904 Make sure that the --no-split flag gets passed to makeinfo.
Fixes PR # 1003 (gdb info files don't work).
1996-02-08 18:27:07 +00:00
wollman
d40449353c Use GZIPCMD to hold name of gzip command rather than just GZIP.
Submitted by: Torsten Blum
1995-07-27 15:03:27 +00:00
wollman
d2d0635519 Compress doc' and info' documents before installing them. 1995-07-26 13:51:46 +00:00
rgrimes
ea0b66528c Add protected and empty maninstall: targets.
Submitted by:	Philippe Charnier <charnier@lirmm.fr>
1995-03-10 08:54:42 +00:00
phk
6ba3ecf5d2 "make distribute" have changed, beware if you use it. 1995-02-25 20:51:14 +00:00
phk
36129bc930 Make sure that info files never hit the "bin" dist. 1995-02-11 05:28:31 +00:00
jkh
7fe5582ae5 Create an obj symlink when necessary.
Submitted by:	"Remy CARD" <Remy.Card@masi.ibp.fr>
1995-02-02 04:53:30 +00:00
jkh
a8745a0ec1 Whomever put the depend rule in screwed it up. Fix it. 1995-01-23 20:53:38 +00:00
jkh
f89d36730c Change DISTRIBUTION names. Also make bsd.doc.mk go to doc distribution,
not bin.  Hmmm.
1995-01-14 07:51:10 +00:00