From 6250e39e311e6a9edc522cbdab7c9581f3435a81 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Mon, 17 Apr 2017 18:18:07 +0200 Subject: [PATCH] Do not hardcode ${datadir} as ${prefix}/share Signed-off-by: Quentin Glidic --- Makefile.am | 8 ++++---- doc/rofi-theme-manpage.markdown | 4 ++-- doc/rofi-theme.5 | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index dfc50ea4..acbc6e01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -124,7 +124,7 @@ rofi_CFLAGS=\ -DSYSCONFDIR=\"$(sysconfdir)\"\ -DTHEME_CONVERTER\ -DPLUGIN_PATH=\"${libdir}/rofi\"\ - -DTHEME_DIR=\"${prefix}/share/rofi/themes/\" + -DTHEME_DIR=\"$(themedir)\" rofi_LDADD=\ $(glib_LIBS)\ @@ -233,7 +233,7 @@ history_test_CFLAGS=\ $(AM_CFLAGS)\ $(glib_CFLAGS)\ $(libsn_CFLAGS)\ - -DTHEME_DIR=\"${prefix}/share/rofi/themes/\"\ + -DTHEME_DIR=\"$(themedir)\"\ -I$(top_srcdir)/include/\ -I$(top_srcdir)/config/\ -I$(top_builddir)/ @@ -259,7 +259,7 @@ textbox_test_CFLAGS=\ $(GW_XCB_CFLAGS)\ $(cairo_CFLAGS)\ $(libsn_CFLAGS)\ - -DTHEME_DIR=\"${prefix}/share/rofi/themes/\"\ + -DTHEME_DIR=\"$(themedir)\"\ -I$(top_srcdir)/include/\ -I$(top_srcdir)/config/\ -I$(top_builddir)/ @@ -399,7 +399,7 @@ helper_test_CFLAGS=\ $(GW_XCB_CFLAGS)\ $(cairo_CFLAGS)\ $(libsn_CFLAGS)\ - -DTHEME_DIR=\"${prefix}/share/rofi/themes/\"\ + -DTHEME_DIR=\"$(themedir)\"\ -I$(top_srcdir)/include/\ -I$(top_srcdir)/config/\ -I$(top_builddir)/ diff --git a/doc/rofi-theme-manpage.markdown b/doc/rofi-theme-manpage.markdown index 36c7ca3a..5a32f46e 100644 --- a/doc/rofi-theme-manpage.markdown +++ b/doc/rofi-theme-manpage.markdown @@ -561,8 +561,8 @@ rofi -dump-theme ## EXAMPLES -Several examples are installed together with **rofi**. These can be found in `{prefix}/share/rofi/themes/` where -`{prefix}` is the install path of **rofi**. When installed using a package manager this usually: `/usr/`. +Several examples are installed together with **rofi**. These can be found in `{datadir}/rofi/themes/` where +`{datadir}` is the install path of **rofi** data. When installed using a package manager this is usually: `/usr/share/`. ## SEE ALSO diff --git a/doc/rofi-theme.5 b/doc/rofi-theme.5 index eb6b1a11..bbbe7241 100644 --- a/doc/rofi-theme.5 +++ b/doc/rofi-theme.5 @@ -906,7 +906,7 @@ rofi \-dump\-theme .IP "" 0 . .SH "EXAMPLES" -Several examples are installed together with \fBrofi\fR\. These can be found in \fB{prefix}/share/rofi/themes/\fR where \fB{prefix}\fR is the install path of \fBrofi\fR\. When installed using a package manager this usually: \fB/usr/\fR\. +Several examples are installed together with \fBrofi\fR\. These can be found in \fB{datadir}/rofi/themes/\fR where \fB{datadir}\fR is the install path of \fBrofi\fR data\. When installed using a package manager this is usually: \fB/usr/share/\fR\. . .SH "SEE ALSO" rofi(1)