all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH zfsonlinux 2/4] d/rules: cosmetic cleanups minimize diff with d.o.
Date: Wed, 24 Feb 2021 22:08:00 +0100	[thread overview]
Message-ID: <20210224210802.8425-3-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20210224210802.8425-1-s.ivanov@proxmox.com>

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/rules | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 932153d2..06100b8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,13 +29,13 @@ override_dh_auto_configure:
 	  --bindir=/usr/bin \
 	  --sbindir=/sbin \
 	  --libdir=/lib/"$(DEB_HOST_MULTIARCH)" \
-	  --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --with-udevdir=/lib/udev \
 	  --with-zfsexecdir=/usr/lib/zfs-linux \
 	  --enable-systemd \
 	  --enable-pyzfs \
 	  --with-python=python3 \
 	  --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \
+	  --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --with-systemdunitdir=/lib/systemd/system \
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-systemdgeneratordir=/lib/systemd/system-generators \
@@ -101,9 +101,11 @@ override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 
+override_dh_install:
+	find debian/tmp/lib -name *.la -delete
+	dh_install
+
 override_dh_missing:
-	find . -name lib*.la -delete
-	rm debian/tmp/lib/$(DEB_HOST_MULTIARCH)/security/pam_zfs_key.la
 	dh_missing --fail-missing
 
 override_dh_installdocs:
-- 
2.20.1





  parent reply	other threads:[~2021-02-24 21:08 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-24 21:07 [pve-devel] [PATCH zfsonlinux 0/4] match library package names with d.o. and minor cleanups Stoiko Ivanov
2021-02-24 21:07 ` [pve-devel] [PATCH zfsonlinux 1/4] d/control: match package names to debian-upstream Stoiko Ivanov
2021-02-24 21:08 ` Stoiko Ivanov [this message]
2021-02-24 21:08 ` [pve-devel] [PATCH zfsonlinux 3/4] d/rules: drop unneeded UDEB conditionals Stoiko Ivanov
2021-02-24 21:08 ` [pve-devel] [PATCH zfsonlinux 4/4] buildsys: validate ABI at build time Stoiko Ivanov
2021-02-25 11:14 ` [pve-devel] applied-series: [PATCH zfsonlinux 0/4] match library package names with d.o. and minor cleanups Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210224210802.8425-3-s.ivanov@proxmox.com \
    --to=s.ivanov@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal