Permalink
Browse files

remove last uses of PLUGINDIR

long live PLUGIN_DIR!
  • Loading branch information...
1 parent f897b35 commit 735723cb5400c1e3bbf5a63a778edca9397929fa @lynxlynxlynx lynxlynxlynx committed May 5, 2014
Showing with 4 additions and 4 deletions.
  1. +1 −1 cmake/cmake_config.h.in
  2. +1 −1 configure.in
  3. +2 −2 gemrb/core/Interface.cpp
View
@@ -7,7 +7,7 @@
#cmakedefine HAVE_STRNDUP 1
#cmakedefine HAVE_STRLCPY 1
#cmakedefine HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1
-#cmakedefine PLUGINDIR "${PLUGIN_DIR}"
+#cmakedefine PLUGIN_DIR "${PLUGIN_DIR}"
#cmakedefine DATA_DIR "${DATA_DIR}"
#cmakedefine SYSCONFDIR "${SYSCONF_DIR}"
#cmakedefine NOCOLOR ${NOCOLOR}
View
@@ -206,7 +206,7 @@ AC_REPLACE_FNMATCH
AC_STRUCT_TM
AC_TYPE_SIZE_T
-CPPFLAGS="$CPPFLAGS -DSYSCONFDIR=\\\"\$(sysconfdir)\\\" -DDATA_DIR=\\\"\$(moddir)\\\" -DPLUGINDIR=\\\"\$(plugindir)\\\""
+CPPFLAGS="$CPPFLAGS -DSYSCONFDIR=\\\"\$(sysconfdir)\\\" -DDATA_DIR=\\\"\$(moddir)\\\" -DPLUGIN_DIR=\\\"\$(plugindir)\\\""
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/gemrb/includes -I\$(top_srcdir)/gemrb/core"
CXXFLAGS="$CXXFLAGS -Wall -W -Wpointer-arith -Wcast-align -pedantic -Wno-format-y2k -Wno-long-long -fno-strict-aliasing"
View
@@ -1565,8 +1565,8 @@ int Interface::Init(InterfaceConfig* config)
CONFIG_PATH("GemRBOverridePath", GemRBOverridePath, GemRBPath);
CONFIG_PATH("GemRBUnhardcodedPath", GemRBUnhardcodedPath, GemRBPath);
-#ifdef PLUGINDIR
- CONFIG_PATH("PluginsPath", PluginsPath, PLUGINDIR);
+#ifdef PLUGIN_DIR
+ CONFIG_PATH("PluginsPath", PluginsPath, PLUGIN_DIR);
#else
CONFIG_PATH("PluginsPath", PluginsPath, "");
if (!PluginsPath[0]) {

0 comments on commit 735723c

Please sign in to comment.