diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 9e77476d3..08921be49 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -109,6 +109,7 @@ install-data-hook: sed -i \ -e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \ -e 's|%(DATADIR)|$(DATADIR)|g' \ + -e 's|%(DATADIR_VAR)|$(DATADIR_VAR)|g' \ -e 's|%(CONTROLDIR)|$(CONTROLDIR)|g' \ -e 's|%(CONTROLDIR_VAR)|$(CONTROLDIR_VAR)|g' \ -e 's|%(FONTDIR)|$(FONTDIR)|g' \ diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.cpp b/src/nhttpd/yhttpd_mods/mod_yparser.cpp index 7dd10b0e1..9b1ab3300 100644 --- a/src/nhttpd/yhttpd_mods/mod_yparser.cpp +++ b/src/nhttpd/yhttpd_mods/mod_yparser.cpp @@ -456,6 +456,7 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) { else if (ycmd_type == "define-get") { if (ycmd_name.compare("CONFIGDIR")) yresult = CONFIGDIR; else if (ycmd_name.compare("DATADIR")) yresult = DATADIR; + else if (ycmd_name.compare("DATADIR_VAR")) yresult = DATADIR_VAR; else if (ycmd_name.compare("CONTROLDIR")) yresult = CONTROLDIR; else if (ycmd_name.compare("CONTROLDIR_VAR")) yresult = CONTROLDIR_VAR; else if (ycmd_name.compare("FONTDIR")) yresult = FONTDIR;