[Python-modules-commits] r18947 - in packages/sphinx/trunk/debian (rules)

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Sat Oct 15 21:02:24 UTC 2011


    Date: Saturday, October 15, 2011 @ 21:02:21
  Author: jwilk
Revision: 18947

Factor out some boring code into make variables.

Modified:
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2011-10-15 20:50:25 UTC (rev 18946)
+++ packages/sphinx/trunk/debian/rules	2011-10-15 21:02:21 UTC (rev 18947)
@@ -10,6 +10,9 @@
 upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
 upstream_version = $(firstword $(subst +, ,$(debian_version)))
 
+locales = $(notdir $(patsubst %/LC_MESSAGES,%,$(wildcard sphinx/locale/*/LC_MESSAGES)))
+scripts = $(basename $(wildcard sphinx-*.py))
+
 debroot = debian/python-sphinx/
 site_packages = $(call py_libdir,$(shell pyversions -d))
 javascript_path = /usr/share/javascript/sphinxdoc/1.0/
@@ -59,8 +62,7 @@
 		.$(site_packages)/sphinx/ext/autosummary/templates
 	set -e -x; \
 	cd $(debroot) && \
-		for lang in $$(find .$(site_packages)/sphinx/locale \
-			-maxdepth 1 -mindepth 1 -type d -printf "%f "); \
+		for lang in $(locales); \
 		do \
 			install -m 644 -D .$(site_packages)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.js \
 				usr/share/sphinx/locale/$$lang/sphinx.js; \
@@ -70,8 +72,8 @@
 	cd $(debroot)$(site_packages)/sphinx/locale && rm -rf sphinx.pot */
 	# install scripts not touched by easy install
 	set -e -x; \
-	for script in sphinx-*.py; do \
-		install -m 755 $$script $(debroot)/usr/bin/$${script%.py}; \
+	for script in $(scripts); do \
+		install -m 755 $${script}.py $(debroot)/usr/bin/$$script; \
 	done
 	# Move JavaScript code to libjs-sphinxdoc:
 	set -e -x; \




More information about the Python-modules-commits mailing list