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
35dd7c93f87407b'>installer</a>/<a href='/guix/log/gnu/installer/parted.scm?id=3be81c85cfa9185447bb47d9e35dd7c93f87407b'>parted.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/installer/parted.scm?id=3be81c85cfa9185447bb47d9e35dd7c93f87407b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-09-21 00:31:15 +0200'>2020-09-21</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=e1f3788944ee154ba9b33c891c4ccf039a1ff39a'>installer: Fix docstring typoes.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/connman.scm (connman-state, run-locale-page)
(start-swapping, stop-swapping, run-installer-steps): Fix typo in
docstring.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-08-06 11:31:38 +0200'>2020-08-06</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=5697a524a75efae6144fcfaad730115910a34171'>installer: Remove logical devices.</a><span class='msg-avail'>...<span class='msg-tooltip'>If a device contains an active logical volume, BLKRRPART will report that the
device is busy. This will cause this device to be filtered by
"non-install-devices" procedure, which is not desired.

Make sure to deactivate all logical volumes before device probing.

Fixes &lt;https://issues.guix.gnu.org/42683&gt;.

* gnu/installer.scm (installer-program): Add lvm2-static to the inputs.
* gnu/installer/parted.scm (remove-logical-devices): New procedure,
(init-parted): call it.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-07-26 18:35:10 +0200'>2020-07-26</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=218a67dfabcdf592325a8f8c49b86478f69ff589'>installer: Add NTFS support.</a><span class='msg-avail'>...<span class='msg-tooltip'>This adds support for creating and editing NTFS partitions. It is however not
possible yet to create root NTFS partitions, as overlaying on top of a fuse
partition does not seem supported.

* gnu/installer.scm (installer-program): Add "ntfs-3g" to the inputs.
* gnu/installer/parted.scm (user-fs-type-name, user-fs-type-&gt;mount-type,
partition-filesystem-user-type, create-ntfs-file-system,
format-user-partitions): Add NTFS support.
* gnu/installer/newt/partition.scm (run-fs-type-page): Add NTFS support.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-02-22 00:45:42 +0100'>2020-02-22</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=5c04b00cf463a543b8ffc9eb55991f6b4cc145dd'>installer: Log important bits to syslog.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer.scm (installer-program): Log crashes with 'syslog'.
* gnu/installer/parted.scm (luks-format-and-open, luks-close)
(mount-user-partitions, umount-user-partitions): Add 'syslog' calls.
* gnu/installer/steps.scm (run-installer-steps): Log the running step
with 'syslog'.
* gnu/installer/utils.scm (run-shell-command): Add calls to 'syslog'.
</span></span></td><td>Ludovic Courtès</td></tr>