From d047704b5deccad5704750ba395a6df1a023ce00 Mon Sep 17 00:00:00 2001 From: daviddavid Date: Mon, 8 Oct 2018 18:52:07 +0200 Subject: Keep raw_format file in /usr/lib/isodumper/ dir --- Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d6d0331..63e7e05 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,8 @@ PREFIX=/usr BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin -LIBDIR=$(shell python3 -c "from __future__ import print_function; from distutils.sysconfig import get_python_lib; print(get_python_lib())") +LIBDIR=$(PREFIX)/lib +PYLIBDIR=$(shell python3 -c "from __future__ import print_function; from distutils.sysconfig import get_python_lib; print(get_python_lib())") LIBEXECDIR=$(PREFIX)/libexec POLKITPOLICYDIR=$(PREFIX)/share/polkit-1/actions DATADIR=$(PREFIX)/share @@ -75,11 +76,14 @@ install: mkdir -p $(DESTDIR)$(POLKITPOLICYDIR) install -m 644 polkit/org.mageia.isodumper.policy $(DESTDIR)$(POLKITPOLICYDIR) - # for LIBFILES isodumper.py raw_format.py raw_write + # for PYLIBFILES isodumper.py raw_write.py + mkdir -p $(DESTDIR)$(PYLIBDIR)/isodumper + install -m 755 lib/isodumper.py $(DESTDIR)$(PYLIBDIR)/isodumper + install -m 755 backend/raw_write.py $(DESTDIR)$(PYLIBDIR)/isodumper + + # for LIBFILES raw_format.py mkdir -p $(DESTDIR)$(LIBDIR)/isodumper - install -m 755 lib/isodumper.py $(DESTDIR)$(LIBDIR)/isodumper install -m 755 lib/raw_format.py $(DESTDIR)$(LIBDIR)/isodumper - install -m 755 backend/raw_write.py $(DESTDIR)$(LIBDIR)/isodumper # for manatools mpan file in /etc/mpan/categories.conf.d/ mkdir -p $(DESTDIR)$(SYSCONFDIR)/mpan/categories.conf.d @@ -107,7 +111,7 @@ install: sed -i -e "s|Name=Format USB devices|Name=Format USB devices (GTK)|" $(DESTDIR)$(DATADIR)/applications/format-usb-gtk.desktop sed -i -e "s|Exec=isodumper|Exec=isodumper --gtk|" $(DESTDIR)$(DATADIR)/applications/format-usb-gtk.desktop - # for isodumper doc + # for isodumper doc mkdir -p $(DESTDIR)$(DOCDIR) install -m 644 COPYING.GPL COPYING.LGPL CHANGELOG README.md i18n.md $(DESTDIR)$(DOCDIR) -- cgit v1.2.1