From 4ed93eac05fdbdd11df9cf5270bee11ab75ab47a Mon Sep 17 00:00:00 2001 From: Papoteur Date: Sun, 7 Oct 2018 21:02:06 +0200 Subject: More generic Makefile according to Pyhton release --- Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7cea0f7..b03bd94 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,7 @@ PREFIX=/usr BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin -======= -LIBDIR=$(PREFIX)/lib/python3.6/site-packages +LIBDIR := $(shell $(PYTHON_PROGRAM) -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 @@ -30,7 +29,6 @@ SYSCONFDIR=/etc DIRS = polkit POFILES = po DBUSDIR=$(SYSCONFDIR)/dbus-1 -PYTHONDIR := $(shell $(PYTHON_PROGRAM) -c "from __future__ import print_function; from distutils.sysconfig import get_python_lib; print(get_python_lib())") PACKAGE = isodumper VERSION = 0.90 @@ -78,10 +76,10 @@ install: install -m 644 polkit/org.mageia.isodumper.policy $(DESTDIR)$(POLKITPOLICYDIR) # for LIBFILES isodumper.py raw_format.py raw_write - mkdir -p $(DESTDIR)$(PYTHONDIR)/isodumper - install -m 755 lib/isodumper.py $(DESTDIR)$(PYTHONDIR)/isodumper - install -m 755 lib/raw_format.py $(DESTDIR)$(PYTHONDIR)/isodumper - install -m 755 backend/raw_write.py $(DESTDIR)$(PYTHONDIR)/isodumper + 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 -- cgit v1.2.1