Attachment #362154 for bug #489644

Lines 61-67 Link Here

(-)a/Makefile.in (-1 / +1 lines)
61	# Various flags	61	# Various flags
62	#	62	#
63		63
64	MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\"	64	MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" -DDOCDIR=L\"$(docdir)\"
65	CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS)	65	CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS)
66	LDFLAGS = @LIBS@ @LDFLAGS@	66	LDFLAGS = @LIBS@ @LDFLAGS@
67	LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@	67	LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@

Lines 189-195 Link Here

(-)a/fish.cpp (-2 / +3 lines)
189	paths.bin = base_path + L"/bin";	189	paths.bin = base_path + L"/bin";
190		190
191	struct stat buf;	191	struct stat buf;
192	if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf))	192	if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf) &&
		193	0 == wstat(paths.doc, &buf))
193	{	194	{
194	done = true;	195	done = true;
195	}	196	}
Lines 202-208 Link Here
202	/* Fall back to what got compiled in. */	203	/* Fall back to what got compiled in. */
203	paths.data = L"" DATADIR "/fish";	204	paths.data = L"" DATADIR "/fish";
204	paths.sysconf = L"" SYSCONFDIR "/fish";	205	paths.sysconf = L"" SYSCONFDIR "/fish";
205	paths.doc = L"" DATADIR "/doc/fish";	206	paths.doc = L"" DOCDIR;
206	paths.bin = L"" BINDIR;	207	paths.bin = L"" BINDIR;
207		208
208	done = true;	209	done = true;

Return to bug 489644