diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | fish.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index a0be4973..dc3a5353 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,7 +61,7 @@ optbindirs = @optbindirs@ # Various flags # -MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" +MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" -DDOCDIR=L\"$(docdir)\" CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS) LDFLAGS = @LIBS@ @LDFLAGS@ LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@ @@ -189,7 +189,8 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0) paths.bin = base_path + L"/bin"; struct stat buf; - if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf)) + if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf) && + 0 == wstat(paths.doc, &buf)) { done = true; } @@ -202,7 +203,7 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0) /* Fall back to what got compiled in. */ paths.data = L"" DATADIR "/fish"; paths.sysconf = L"" SYSCONFDIR "/fish"; - paths.doc = L"" DATADIR "/doc/fish"; + paths.doc = L"" DOCDIR; paths.bin = L"" BINDIR; done = true; |