]> git.proxmox.com Git - libtpms.git/commitdiff
make debhelper play nice with autotools
authorNeil Roza <neil@rtr.ai>
Mon, 6 Apr 2020 15:59:13 +0000 (15:59 +0000)
committerStefan Berger <stefanb@us.ibm.com>
Mon, 6 Apr 2020 16:22:48 +0000 (12:22 -0400)
We need to inform debhelper that it will be driving the action using autotools.

edit `debian/control` field `Build-Depends`: add `autotools-dev` and
`dh-autoreconf`

edit `debian/rules`:

* change the default target `%` to invoke `dh` with `autotools-dev` and
  `autoreconf`

* remove from `override_dh_auto_configure` the invocation to `./autogen.sh`
  obsoleted by `dh-autoreconf`

debian/control
debian/rules

index 9e8100ed5c8ecf74bb20a51d039a026f8487c47b..05669d7a229c1b9464edc2446c3689f97d63d9b9 100644 (file)
@@ -6,7 +6,9 @@ Standards-Version: 3.9.7
 Build-Depends:
  autoconf,
  automake,
+ autotools-dev,
  debhelper (>= 9),
+ dh-autoreconf,
  dh-exec,
  gawk,
  libssl-dev,
index 067365c5545af1602779e891ce670ba8ab353c32..3456da88dac7fcd2c61d2605abfde102468c71af 100755 (executable)
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 
+# export DH_VERBOSE=1
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-       dh $@ --parallel 
+       dh $@ --parallel --with autotools-dev --with autoreconf
 
 override_dh_auto_configure:
-       NOCONFIGURE=1 ./autogen.sh
        dh_auto_configure -- --with-openssl --with-tpm2
 
 override_dh_usrlocal: