diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-09-08 12:18:40 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-09-08 12:18:40 +0200 |
| commit | 22bcb2f1bd4f894ab82aec3201bdd672a9cedb45 (patch) | |
| tree | 89a4599019f91cb2981352ebd1d1f02e1e95bf50 /ubuntu/precise/applications/tde-guidance/debian/python-distutils-jaunty.mk | |
| parent | 442b14b852d6c156a43d2ecb88e304a514800960 (diff) | |
| parent | 424e979d8a2e10edd215b055c3fcbf89369e4c4e (diff) | |
| download | tde-packaging-22bcb2f1bd4f894ab82aec3201bdd672a9cedb45.tar.gz tde-packaging-22bcb2f1bd4f894ab82aec3201bdd672a9cedb45.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise/applications/tde-guidance/debian/python-distutils-jaunty.mk')
| -rw-r--r-- | ubuntu/precise/applications/tde-guidance/debian/python-distutils-jaunty.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ubuntu/precise/applications/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/precise/applications/tde-guidance/debian/python-distutils-jaunty.mk index 72efb646f..1a1ec9a8e 100644 --- a/ubuntu/precise/applications/tde-guidance/debian/python-distutils-jaunty.mk +++ b/ubuntu/precise/applications/tde-guidance/debian/python-distutils-jaunty.mk @@ -161,9 +161,10 @@ endif ifdef _cdbs_rules_debhelper DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) + ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) endif @@ -256,6 +257,7 @@ endif # archall detection ifdef _cdbs_rules_debhelper DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) @@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) else dh_pycentral -p$(cdbs_curpkg) endif - dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) + ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) endif |