From 03310c1388090271cdced8057c49b2ab2558552b Mon Sep 17 00:00:00 2001

From: Michael Shigorin <mike@altlinux.org>

Date: Wed, 26 Jun 2019 12:45:29 +0300

Subject: [PATCH] Makefile: getconf LIBDIR instead of arch list

That list was incomplete at least without mips64{,el},

riscv64, e2k; doing it properly is just asking the system.

---

 Makefile | 14 +++++---------

 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile

index 8aaf3d9..5f03777 100644

--- a/Makefile

+++ b/Makefile

@@ -4,11 +4,7 @@ PYTHONINCLUDE := $(shell $(PYTHON)-config --includes)

 VERSION=1.2.3

-ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64,$(shell uname -m)))

-LIBDIR = lib64

-else

-LIBDIR = lib

-endif

+LIBDIR := $(shell getconf LIBDIR)

 CFLAGS += -std=gnu11 -Wall -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -fPIC $(PYTHONINCLUDE)

@@ -51,14 +47,14 @@ install-python:

 	install -m 0755 pyisomd5sum.so $(DESTDIR)$(PYTHONSITEPACKAGES)

 install-devel:

+	install -d -m 0755 $(DESTDIR)$(LIBDIR)

 	install -d -m 0755 $(DESTDIR)/usr/include

-	install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)

 	install -d -m 0755 $(DESTDIR)/usr/share/pkgconfig

 	install -m 0644 libimplantisomd5.h $(DESTDIR)/usr/include/

 	install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/

-	install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR)

-	install -m 0644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR)

-	sed "s#@VERSION@#${VERSION}#g; s#@includedir@#/usr/include#g; s#@libdir@#/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc

+	install -m 0644 libimplantisomd5.a $(DESTDIR)$(LIBDIR)

+	install -m 0644 libcheckisomd5.a $(DESTDIR)$(LIBDIR)

+	sed "s#@VERSION@#${VERSION}#g; s#@includedir@#/usr/include#g; s#@libdir@#${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc

 clean:

 	rm -f *.o *.so *.pyc *.a .depend *~

-- 

2.10.4