d/rules: correctly make use of the dh sequencer in the build step

override dh_auto_build instead of using build/build-arch/build-indep
targets directly.
This makes possible for dh to call dh_autoreconf and other helpers that
would otherwise be skipped (like dh_update_autotools_config).
Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parent 762ce9b2
...@@ -41,10 +41,7 @@ CONFIGURE_FLAGS := --disable-silent-rules --with-history CC="$(CC)" CFLAGS="$(CF ...@@ -41,10 +41,7 @@ CONFIGURE_FLAGS := --disable-silent-rules --with-history CC="$(CC)" CFLAGS="$(CF
override_dh_auto_configure: $(TARGETS:%=doconfigure-%) override_dh_auto_configure: $(TARGETS:%=doconfigure-%)
debian/autoreconf.after: doconfigure-%:
dh_autoreconf
doconfigure-%: debian/autoreconf.after
dh_auto_configure --parallel --builddirectory=builddir/$(*) -- $(CONFIGURE_FLAGS) dh_auto_configure --parallel --builddirectory=builddir/$(*) -- $(CONFIGURE_FLAGS)
touch $@ touch $@
...@@ -67,10 +64,8 @@ dobuild-python%-dbg: BUILD_FLAGS+=PYTHON_INCLUDES='$(shell $(DEB_HOST_GNU_TYPE)- ...@@ -67,10 +64,8 @@ dobuild-python%-dbg: BUILD_FLAGS+=PYTHON_INCLUDES='$(shell $(DEB_HOST_GNU_TYPE)-
CFLAGS='$(CFLAGS) -Wall -g -O0' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS) \ CFLAGS='$(CFLAGS) -Wall -g -O0' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS) \
-L$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)' -L$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)'
#override_dh_auto_build: $(TARGETS:%=dobuild-%) override_dh_auto_build-arch: $(TARGETS:%=dobuild-%)
build-arch: $(TARGETS:%=dobuild-%) override_dh_auto_build-indep: dobuild-main
build-indep: dobuild-main
build: build-arch build-indep
override_dh_auto_clean: override_dh_auto_clean:
rm -rf builddir debian/tmp-dbg debian/tmp-udeb rm -rf builddir debian/tmp-dbg debian/tmp-udeb
......
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