This patch distinguishes between the data directory path for GUI and the one
for non-GUI by allowing to set the former path.

highlight package has two outputs: out and gui.  Both outputs have files which
will be in the same directory /share/highlight/ without this patch (see also
install and install-gui tasks in makefile).  In the gui's data directory,
there are GUI specific files in /share/highlight/gui-files/{l10n,ext}/.

diff --git a/src/gui-qt/main.cpp b/src/gui-qt/main.cpp
index 4700dc1..3567745 100644
--- a/src/gui-qt/main.cpp
+++ b/src/gui-qt/main.cpp
@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     QTranslator translator;
-#ifdef DATA_DIR
-    translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(DATA_DIR).arg(QLocale::system().name()));
+#ifdef GUI_DATA_DIR
+    translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(GUI_DATA_DIR).arg(QLocale::system().name()));
 #else
     translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(QDir::currentPath()).arg(QLocale::system().name()));
 #endif
diff --git a/src/gui-qt/mainwindow.cpp b/src/gui-qt/mainwindow.cpp
index 3a21ad2..f060431 100644
--- a/src/gui-qt/mainwindow.cpp
+++ b/src/gui-qt/mainwindow.cpp
@@ -2131,8 +2131,8 @@ QString MainWindow::getDistFileFilterPath(){
 #ifdef Q_OS_OSX
     return QCoreApplication::applicationDirPath()+"/../Resources/gui_files/ext/fileopenfilter.conf";
 #else
-    #ifdef DATA_DIR
-    return QString(DATA_DIR) + "/gui_files/ext/fileopenfilter.conf";
+    #ifdef GUI_DATA_DIR
+    return QString(GUI_DATA_DIR) + "/gui_files/ext/fileopenfilter.conf";
     #else
     return QDir::currentPath()+"/gui_files/ext/fileopenfilter.conf";
     #endif
diff --git a/src/makefile b/src/makefile
index b1d7988..2963105 100644
--- a/src/makefile
+++ b/src/makefile
@@ -118,7 +118,7 @@ gui-qt: highlight-gui
 
 highlight-gui: libhighlight.a ${GUI_OBJECTS}
 	cd gui-qt && \
-	${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
+	${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" GUI_DATA_DIR=\\\"${GUI_DATA_DIR}\\\" ' && \
 	$(MAKE)
 
 $(OBJECTFILES) : makefile
afbe841091091366c96bc'>packages</a>/<a href='/guix/log/gnu/packages/esolangs.scm?id=fcc39864dba82e14895afbe841091091366c96bc'>esolangs.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/esolangs.scm?id=fcc39864dba82e14895afbe841091091366c96bc&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-03-17 14:21:29 +0100'>2021-03-17</span></td><td><a href='/guix/commit/gnu/packages/esolangs.scm?id=fef91c0cc8770c6c4fce08bd748e6f241a8cd682'>gnu: Move lolcode to esolangs.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/lolcode.scm (lci): Move from here...
* gnu/packages/esolangs.scm (lolcode-lci): ... to here.
* gnu/packages/lolcode.scm: Delete file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.
</span></span></td><td>Leo Prikler</td></tr>
<tr><td><span title='2020-12-29 13:54:48 +0100'>2020-12-29</span></td><td><a href='/guix/commit/gnu/packages/esolangs.scm?id=142f8713ab647ecb8833dcf9eb98e3bdc62cd44a'>gnu: Add shakespeare-spl.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/shakespeare-spl-fix-grammar.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it here.
* gnu/packages/esolangs.scm (shakespeare-spl): New variable.
</span></span></td><td>Leo Prikler</td></tr>
<tr><td><span title='2020-12-15 16:59:01 -0500'>2020-12-15</span></td><td><a href='/guix/commit/gnu/packages/esolangs.scm?id=0510ca15aa395ddd3daf0720b541662671bf14c3'>gnu: Add cfunge.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/esolangs.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

Signed-off-by: Leo Famulari &lt;leo@famulari.name&gt;
</span></span></td><td>Hendursaga</td></tr>