[Pkg-octave-commit] [octave-pkg-dev] 02/02: octave-pkg.mk: Run pre-build, build/*, and install/* targets

Rafael Laboissiere rafael at debian.org
Fri Dec 29 09:56:01 UTC 2017


This is an automated email from the git hooks/post-receive script.

rafael pushed a commit to branch master
in repository octave-pkg-dev.

commit ffd2395a796f4dd9f73b989a463f1e80fc086e58
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri Dec 29 07:49:23 2017 -0200

    octave-pkg.mk: Run pre-build, build/*, and install/* targets
    
    Gbp-Dch: Ignore
---
 octave-pkg.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/octave-pkg.mk b/octave-pkg.mk
index 15baf84..34e63b9 100644
--- a/octave-pkg.mk
+++ b/octave-pkg.mk
@@ -67,10 +67,19 @@ include /usr/share/dpkg/buildflags.mk
 # Oct-files ldflags are taken from the following variable
 export OCT_LINK_OPTS=$(LDFLAGS)
 
+PACKAGES = $(shell perl -e 'use Debian::Debhelper::Dh_Lib;print join(" ", getpackages())')
+
 %:
 	dh $@
 
 override_dh_auto_build:
+	## The following is a hack that simplifies the switch from
+	## CDBS into dh for packages using the building infrastructure
+	## of octave-pkg-dev.
+	-$(MAKE) -k -f debian/rules pre-build
+	-for pkg in $(PACKAGES); do 			\
+	    $(MAKE) -k -f debian/rules build/$$pkg ;	\
+	done
 
 override_dh_auto_install:
 	# Check version
@@ -92,6 +101,12 @@ override_dh_auto_install:
 	-rmdir --ignore-fail-on-non-empty -p	\
 		 $(CURDIR)/$(debpkg)/$(mpath)	\
 		 $(CURDIR)/$(debpkg)/$(bpath)
+	## The following is a hack that simplifies the switch from
+	## CDBS into dh for packages using the building infrastructure
+	## of octave-pkg-dev.
+	-for pkg in $(PACKAGES); do 			\
+	    $(MAKE) -k -f debian/rules install/$$pkg ;	\
+	done
 
 override_dh_auto_test:
 

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-pkg-dev.git



More information about the Pkg-octave-commit mailing list