diff options
author | Greg Hudson <ghudson@mit.edu> | 2012-08-02 01:05:31 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2012-08-02 01:28:06 -0400 |
commit | 1c91183b27de00ead74392b3dd7bdc22e810ac0b (patch) | |
tree | 9ece6920b3050971b5c2dc65e33ca9d45c990610 /src/doc | |
parent | 5912917515cd869ed5640af4d68dcd7f8af65e30 (diff) | |
download | krb5-1c91183b27de00ead74392b3dd7bdc22e810ac0b.tar.gz krb5-1c91183b27de00ead74392b3dd7bdc22e810ac0b.tar.xz krb5-1c91183b27de00ead74392b3dd7bdc22e810ac0b.zip |
Fix default substitution of ccache/keytab names
Tie up some loose ends in substitution of the default ccache/keytab
names after 688a2702d2045abf5f99acfb59f3f372391e5be4:
* Fix the substhtml target in src/doc/Makefile.in
* Don't add FILE: when substituting the default keytab and client
keytab names, as the defaults already have it.
Diffstat (limited to 'src/doc')
-rw-r--r-- | src/doc/Makefile.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in index fecff29f9..d87a87c96 100644 --- a/src/doc/Makefile.in +++ b/src/doc/Makefile.in @@ -7,6 +7,9 @@ DOXYGEN=doxygen docsrc=$(top_srcdir)/../doc localstatedir=@localstatedir@ sysconfdir=@sysconfdir@ +DEFCCNAME=@DEFCCNAME@ +DEFKTNAME=@DEFKTNAME@ +DEFCKTNAME=@DEFCKTNAME@ # Create HTML documentation in $(docsrc)/rst_html suitable for a # release tarball or the web site (that is, without substitutions for @@ -52,6 +55,9 @@ paths.py: echo 'libdir = "``$(KRB5_LIBDIR)``"' >> $@ echo 'localstatedir = "``$(localstatedir)``"' >> $@ echo 'sysconfdir = "``$(sysconfdir)``"' >> $@ + echo 'ccache = "``$(DEFCCNAME)``"' >> $@ + echo 'keytab = "``$(DEFKTNAME)``"' >> $@ + echo 'ckeytab = "``$(DEFCKTNAME)``"' >> $@ clean:: rm -rf doxy rst_apiref rst_composite rst_html_subst Doxyfile paths.py |