Commit 5f9d04b0 authored by Sven Eckelmann's avatar Sven Eckelmann

Drop manual out-of-tree autoreconf

parent 5603b89d
......@@ -2,6 +2,9 @@ libg3d (0.0.8-28) UNRELEASED; urgency=medium
* debian/control:
- Automatically select correct Vcs-Git branch
* debian/rules:
- Drop out-of-tree autoreconf which broke new debhelper autoreconf on
second build (Closes: #924756)
-- Sven Eckelmann <sven@narfation.org> Sun, 03 Mar 2019 13:19:33 +0100
......
......@@ -6,7 +6,6 @@ export DEB_CPPFLAGS_MAINT_APPEND = -D_FILE_OFFSET_BITS=64
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
BUILDROOT=build
DOPACKAGES = $(shell dh_listpackages)
CONFIGURE_ARGS = --libexecdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)/libg3d' --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)/' --disable-libmagic
......@@ -17,26 +16,7 @@ CONFIGURE_ARGS += --enable-gtk-doc
endif
binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
dh $@ --without autoreconf
override_dh_auto_configure:
rm -rf "$(CURDIR)/$(BUILDROOT)"
set -e ;\
( mkdir -p "$(CURDIR)/$(BUILDROOT)" ;\
for f in "$(CURDIR)"/*; do cp -arf "$$f" "$(CURDIR)/$(BUILDROOT)/" || true; done ;\
cd "$(CURDIR)/$(BUILDROOT)" ;\
gtkdocize --copy ;\
autoreconf -fi -I m4 ;\
dh_auto_configure -- $(CONFIGURE_ARGS) )
override_dh_auto_clean:
rm -rf "$(CURDIR)/$(BUILDROOT)"
override_dh_auto_build:
cd "$(CURDIR)/$(BUILDROOT)" && dh_auto_build
override_dh_auto_install:
cd "$(CURDIR)/$(BUILDROOT)" && dh_auto_install --destdir="$(CURDIR)/debian/tmp/"
dh $@
override_dh_installdocs:
dh_installdocs -A AUTHORS README TODO
......@@ -45,4 +25,4 @@ override_dh_auto_test:
# do nothing to fix dh_auto_test thinks that tests is test target
.PHONY: binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep \
override_dh_auto_configure override_dh_auto_clean override_dh_auto_build override_dh_auto_install override_dh_installdocs override_dh_auto_test
override_dh_installdocs override_dh_auto_test
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment