From 47303007ebad22e4c50bed426bfbe71e94d13c60 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 3 Jun 2014 17:08:29 -0700 Subject: [PATCH] Remove the ?docs token It's not actually used anywhere and not even set on Windows. --- Makefile.inc.in | 1 - libaegisub/Makefile | 2 +- libaegisub/common/path.cpp | 1 - libaegisub/unix/path.cpp | 1 - libaegisub/windows/path_win.cpp | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.inc.in b/Makefile.inc.in index 18cd9b7ad..749f9062c 100644 --- a/Makefile.inc.in +++ b/Makefile.inc.in @@ -62,7 +62,6 @@ P_LOCALE = @localedir@ P_DESKTOP = @P_DESKTOP@ P_ICON = @P_ICON@ P_DATA = $(P_DATAROOT)/aegisub/ -P_DOC = @docdir@ ############### # LIBRARY FLAGS diff --git a/libaegisub/Makefile b/libaegisub/Makefile index 29882968b..7f570ec59 100644 --- a/libaegisub/Makefile +++ b/libaegisub/Makefile @@ -10,7 +10,7 @@ lagi_pre.h.gch: CXXFLAGS := $(CXXFLAGS) common/charset_conv.o: CXXFLAGS += $(CFLAGS_ICONV) common/parser.o: CXXFLAGS += -ftemplate-depth=256 -unix/path.o: CXXFLAGS += -DP_DATA=\"$(P_DATA)\" -DP_DOC=\"$(P_DOC)\" -DP_LOCALE=\"$(P_LOCALE)\" +unix/path.o: CXXFLAGS += -DP_DATA=\"$(P_DATA)\" SRC += \ common/parser.cpp \ diff --git a/libaegisub/common/path.cpp b/libaegisub/common/path.cpp index 7fa7e899d..c7407a823 100644 --- a/libaegisub/common/path.cpp +++ b/libaegisub/common/path.cpp @@ -43,7 +43,6 @@ Path::Path() { tokens["?data"]; tokens["?temp"]; tokens["?dictionary"]; - tokens["?docs"]; FillPlatformSpecificPaths(); diff --git a/libaegisub/unix/path.cpp b/libaegisub/unix/path.cpp index 761233177..8e7f76be2 100644 --- a/libaegisub/unix/path.cpp +++ b/libaegisub/unix/path.cpp @@ -53,7 +53,6 @@ void Path::FillPlatformSpecificPaths() { #endif SetToken("?temp", boost::filesystem::temp_directory_path()); SetToken("?dictionary", "/usr/share/hunspell"); - SetToken("?docs", P_DOC); } } diff --git a/libaegisub/windows/path_win.cpp b/libaegisub/windows/path_win.cpp index 9784a9454..77eb27ae6 100644 --- a/libaegisub/windows/path_win.cpp +++ b/libaegisub/windows/path_win.cpp @@ -51,7 +51,6 @@ void Path::FillPlatformSpecificPaths() { SetToken("?data", filename); SetToken("?dictionary", Decode("?data/dictionaries")); - //SetToken("?docs", Decode("?data/docs")); } }