| |
@@ -55,7 +55,7 @@
|
| |
LDFLAGS="${LDFLAGS}" \
|
| |
LFLAGS="-Wl,-O1 ${LDFLAGS}" \
|
| |
PREFIX="%{_prefix}" \
|
| |
- conf_dir="%{_sysconfdir}/highlight/"
|
| |
+ conf_dir="%{_sysconfdir}/"
|
| |
|
| |
%if %{with qt}
|
| |
%{__make} gui CFLAGS="${CFLAGS}" \
|
| |
@@ -63,18 +63,18 @@
|
| |
LDFLAGS="${LDFLAGS}" \
|
| |
LFLAGS="-Wl,-O1 ${LDFLAGS}" \
|
| |
PREFIX="%{_prefix}" \
|
| |
- conf_dir="%{_sysconfdir}/highlight/" \
|
| |
+ conf_dir="%{_sysconfdir}/" \
|
| |
QMAKE="%{_qt5_qmake}" \
|
| |
QMAKE_STRIP=
|
| |
%endif
|
| |
|
| |
%install
|
| |
- %make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
|
| |
+ %make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/"
|
| |
|
| |
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
|
| |
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
| |
%if %{with qt}
|
| |
- make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
|
| |
+ make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/"
|
| |
%endif
|
| |
|
| |
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
|
| |
Current package installs files to
/etc/highlight/highlight/*instead of/etc/highlight/*Fixes my problem with ikiwiki's highlight plugin looking for
/etc/highlight/filetypes.confby default.This may also be related to rhbz#1932787 - highlight-gui isn't looking for any of its files in the right place
but I don't use highlight-gui so can't confirm.
See upstream https://gitlab.com/saalen/highlight/-/issues/232