From dcfa3ffeeff99b01c697f5c17cefe8fbfd21a7da Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Fri, 22 May 2020 22:07:21 +0300 Subject: [PATCH] [libmce-glib] Respect arch specific lib dir. JB#49681 --- .gitignore | 1 + Makefile | 20 +++++++++++++------- debian/control | 4 ++-- debian/libmce-glib-dev.install | 3 --- debian/libmce-glib-dev.install.in | 3 +++ debian/libmce-glib.install | 1 - debian/libmce-glib.install.in | 1 + debian/rules | 7 ++++++- libmce-glib.pc.in | 4 ++-- rpm/libmce-glib.spec | 4 ++-- 10 files changed, 30 insertions(+), 18 deletions(-) delete mode 100644 debian/libmce-glib-dev.install create mode 100644 debian/libmce-glib-dev.install.in delete mode 100644 debian/libmce-glib.install create mode 100644 debian/libmce-glib.install.in diff --git a/.gitignore b/.gitignore index 6496a2e..1cd7712 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ debian/libmce-glib debian/libmce-glib-dev debian/*.debhelper.log debian/*.debhelper +debian/*.install debian/*.substvars debian/tmp documentation.list diff --git a/Makefile b/Makefile index 6603890..5b4d8b3 100644 --- a/Makefile +++ b/Makefile @@ -133,14 +133,13 @@ debug: $(DEBUG_LIB) $(DEBUG_LINK) release: $(RELEASE_LIB) $(RELEASE_LINK) -pkgconfig: $(PKGCONFIG) - clean: rm -f *~ $(SRC_DIR)/*~ $(INCLUDE_DIR)/*~ rpm/*~ rm -fr $(BUILD_DIR) RPMS installroot rm -fr debian/tmp debian/lib$(NAME) debian/lib$(NAME)-dev rm -f documentation.list debian/files debian/*.substvars rm -f debian/*.debhelper.log debian/*.debhelper debian/*~ + rm -f debian/*.install $(GEN_DIR): mkdir -p $@ @@ -181,8 +180,17 @@ $(DEBUG_LINK): $(RELEASE_LINK): ln -sf $(LIB) $@ +# This one could be substituted with arch specific dir +LIBDIR ?= /usr/lib +ABS_LIBDIR := $(shell echo /$(LIBDIR) | sed -r 's|/+|/|g') + +pkgconfig: $(PKGCONFIG) + $(PKGCONFIG): $(LIB_NAME).pc.in Makefile - sed -e 's/\[version\]/'$(PCVERSION)/g $< > $@ + sed -e 's|@version@|$(PCVERSION)|g' -e 's|@libdir@|$(ABS_LIBDIR)|g' $< > $@ + +debian/%.install: debian/%.install.in + sed 's|@LIBDIR@|$(LIBDIR)|g' $< > $@ # # Install @@ -192,11 +200,9 @@ INSTALL = install INSTALL_DIRS = $(INSTALL) -d INSTALL_FILES = $(INSTALL) -m 644 -INSTALL_LIB_DIR = $(DESTDIR)/usr/lib +INSTALL_LIB_DIR = $(DESTDIR)$(ABS_LIBDIR) INSTALL_INCLUDE_DIR = $(DESTDIR)/usr/include/$(LIB_NAME) -INSTALL_PKGCONFIG_DIR = $(DESTDIR)/usr/lib/pkgconfig - -INSTALL_ALIAS = $(INSTALL_LIB_DIR)/$(LIB_SHORTCUT) +INSTALL_PKGCONFIG_DIR = $(DESTDIR)$(ABS_LIBDIR)/pkgconfig install: $(INSTALL_LIB_DIR) $(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_LIB_DIR) diff --git a/debian/control b/debian/control index 980b66b..2c66284 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: libmce-glib Section: libs Priority: optional Maintainer: Slava Monich -Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.0), libglibutil-dev, mce-dev +Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil-dev, mce-dev Standards-Version: 3.8.4 Package: libmce-glib Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: libglibutil (>= 1.0.5), ${shlibs:Depends}, ${misc:Depends} Description: Client library for mce Package: libmce-glib-dev diff --git a/debian/libmce-glib-dev.install b/debian/libmce-glib-dev.install deleted file mode 100644 index cce5a7d..0000000 --- a/debian/libmce-glib-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/lib/libmce-glib.so usr/lib -include/*.h usr/include/libmce-glib -build/libmce-glib.pc usr/lib/pkgconfig diff --git a/debian/libmce-glib-dev.install.in b/debian/libmce-glib-dev.install.in new file mode 100644 index 0000000..c07d428 --- /dev/null +++ b/debian/libmce-glib-dev.install.in @@ -0,0 +1,3 @@ +debian/tmp/@LIBDIR@/libmce-glib.so @LIBDIR@ +debian/tmp/@LIBDIR@/pkgconfig/libmce-glib.pc @LIBDIR@/pkgconfig +debian/tmp/usr/include/* usr/include diff --git a/debian/libmce-glib.install b/debian/libmce-glib.install deleted file mode 100644 index 6a4fd9f..0000000 --- a/debian/libmce-glib.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libmce-glib.so.* usr/lib diff --git a/debian/libmce-glib.install.in b/debian/libmce-glib.install.in new file mode 100644 index 0000000..661666a --- /dev/null +++ b/debian/libmce-glib.install.in @@ -0,0 +1 @@ +debian/tmp/@LIBDIR@/libmce-glib.so.* @LIBDIR@ diff --git a/debian/rules b/debian/rules index 3a92007..fd7b2a3 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,13 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +override_dh_auto_build: + dh_auto_build -- LIBDIR=$(LIBDIR) release pkgconfig debian/libmce-glib.install debian/libmce-glib-dev.install + override_dh_auto_install: - dh_auto_install -- install-dev + dh_auto_install -- LIBDIR=$(LIBDIR) install-dev %: dh $@ diff --git a/libmce-glib.pc.in b/libmce-glib.pc.in index f44a058..c89a268 100644 --- a/libmce-glib.pc.in +++ b/libmce-glib.pc.in @@ -1,9 +1,9 @@ -libdir=/usr/lib +libdir=@libdir@ includedir=/usr/include Name: libmce-glib Description: MCE client library -Version: [version] +Version: @version@ Requires.private: libglibutil glib-2.0 gio-2.0 Libs: -lmce-glib Cflags: -I${includedir}/libmce-glib diff --git a/rpm/libmce-glib.spec b/rpm/libmce-glib.spec index df3dec7..6f4c6e9 100644 --- a/rpm/libmce-glib.spec +++ b/rpm/libmce-glib.spec @@ -28,11 +28,11 @@ This package contains the development library for %{name}. %setup -q %build -make KEEP_SYMBOLS=1 release pkgconfig +make LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig %install rm -rf %{buildroot} -make install-dev DESTDIR=%{buildroot} +make LIBDIR=%{_libdir} DESTDIR=%{buildroot} install-dev %post -p /sbin/ldconfig