diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2021-11-08 14:13:43 +0000 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2021-11-08 14:14:53 +0000 |
| commit | 41e116b44d3765662bf71ed00dbf40e0cfd5ea3b (patch) | |
| tree | 4fc43534b411c523ee0aa79a606522e3eb031123 | |
| parent | 1fc95ead6c74ca78877b65a59e883c82ec9c0e36 (diff) | |
| download | enchant-41e116b44d3765662bf71ed00dbf40e0cfd5ea3b.tar.gz | |
Fix generation of man pages
First, enchant-lsmod man page does not need to be run through the edit
script, as it contains no references to datadir.
Secondly, datadir needs to be handled differently, to prevent its being
prematurely expanded by configure.
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/enchant.1.in | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 912c1a6..35ff7ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ pkgdata_DATA = enchant.ordering dist_man_MANS = enchant-@ENCHANT_MAJOR_VERSION@.1 enchant-lsmod-@ENCHANT_MAJOR_VERSION@.1 edit = sed \ - -e 's|@datadir[@]|$(datadir)|g' + -e 's|DATADIR|$(datadir)|g' DISTCLEANFILES = $(dist_man_MANS) @@ -35,9 +35,7 @@ enchant-@ENCHANT_MAJOR_VERSION@.1: $(builddir)/enchant.1 Makefile.am $(top_build mv $@.tmp $@ enchant-lsmod-@ENCHANT_MAJOR_VERSION@.1: $(builddir)/enchant-lsmod.1 Makefile.am $(top_builddir)/config.status - rm -f $@ $@.tmp - $(edit) $(abs_builddir)/enchant-lsmod.1 >$@.tmp - mv $@.tmp $@ + cp $(abs_builddir)/enchant-lsmod.1 $@ LDADD = libenchant-@ENCHANT_MAJOR_VERSION@.la $(ENCHANT_LIBS) $(top_builddir)/lib/libgnu.la bin_PROGRAMS = enchant-@ENCHANT_MAJOR_VERSION@ enchant-lsmod-@ENCHANT_MAJOR_VERSION@ diff --git a/src/enchant.1.in b/src/enchant.1.in index 4ee07f6..5916a1f 100644 --- a/src/enchant.1.in +++ b/src/enchant.1.in @@ -59,11 +59,11 @@ Default: \fI~/.config/enchant\fR \fICSIDL_LOCAL_APPDATA\\enchant\fR (Windows systems) Default: \fIC:\\Documents and Settings\\\fRusername\fI\\Local Settings\\Application Data\\enchant .TP -\fI@datadir@/enchant\fR +\fIDATADIR/enchant\fR (Or the equivalent location relative to the enchant library for a relocatable build.) .PP Dictionaries are looked for in a subdirectory with the same name as the -provider; for example, \fI@datadir@/enchant/hunspell\fR and +provider; for example, \fIDATADIR/enchant/hunspell\fR and \fI~/.config/enchant/hunspell\fR. .PP Some providers may also look in a standard system directory for their |