From 08234805e0dda95c3b212cf226cca08f4ca156cd Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Sat, 24 Feb 2018 11:06:22 +0300 Subject: [PATCH] Fix consistency between /usr and /usr/local By default the Makefile installs data into /usr/share (with default prefix /usr) but the binary is installed into /usr/local/bin (as if the prefix were /usr/local). Improve consistency by dropping "local" from the binary path. If the user wants to install into /usr/local he/she can do PREFIX=/usr/local --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a1e127342..acfdfa1f7 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ install: sed -e 's:@PREFIX@:${PREFIX}:' tools/runanki.system.in > tools/runanki.system chmod 755 tools/runanki.system cd ${DESTDIR}${PREFIX}/share/anki && (\ - mv tools/runanki.system ${DESTDIR}${PREFIX}/local/bin/anki;\ + mv tools/runanki.system ${DESTDIR}${PREFIX}/bin/anki;\ test -d ${DESTDIR}${PREFIX}/share/pixmaps &&\ mv anki.xpm anki.png ${DESTDIR}${PREFIX}/share/pixmaps/;\ mv anki.desktop ${DESTDIR}${PREFIX}/share/applications;\ @@ -25,7 +25,7 @@ install: uninstall: rm -rf ${DESTDIR}${PREFIX}/share/anki - rm -rf ${DESTDIR}${PREFIX}/local/bin/anki + rm -rf ${DESTDIR}${PREFIX}/bin/anki rm -rf ${DESTDIR}${PREFIX}/share/pixmaps/anki.xpm rm -rf ${DESTDIR}${PREFIX}/share/pixmaps/anki.png rm -rf ${DESTDIR}${PREFIX}/share/applications/anki.desktop