[Pkg-javascript-commits] [leaflet-markercluster] 02/08: Tidy rules file: Generalize js-destwebdir.

Jonas Smedegaard js at moszumanska.debian.org
Sat Feb 1 14:56:36 UTC 2014


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

js pushed a commit to branch master
in repository leaflet-markercluster.

commit 3159fcbb3971a200f799bf2f57750e320f2b9c5f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Feb 1 12:10:00 2014 +0100

    Tidy rules file: Generalize js-destwebdir.
---
 debian/rules | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4fbff0e..0f18bdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,8 @@ DEB_UPSTREAM_REPACKAGE_EXCLUDES += example/realworld.*.js
 # Installation
 #
 
-js-destdir = /usr/share/javascript/$(libname)
+js-destwebdir = /javascript/$(libname)
+js-destdir = /usr/share$(js-destwebdir)
 
 # install files to the js-dest-dir as defined by javascript-common
 DEB_DH_INSTALL_ARGS_$(pkg) = dist/* $(js-destdir)
@@ -74,5 +75,5 @@ build/$(pkg)::
 # use common Debian relative paths (not CDN or source-relative)
 html-examples = $(cdbs_curdestdir)usr/share/doc/$(cdbs_curpkg)/examples/*.html
 binary-fixup/$(pkg)::
-	perl -i -pe 's,(href|src)="\Khttp://cdn.leafletjs.com/leaflet-[^/]*,/javascript/leaflet,g' $(html-examples)
-	perl -i -pe 's,(href|src)="\K../dist,/javascript/leaflet-markercluster,g' $(html-examples)
+	perl -i -pe 's,(href|src)="\Khttp://cdn.leafletjs.com/leaflet-[^/]*,$(js-destwebdir),g' $(html-examples)
+	perl -i -pe 's,(href|src)="\K../dist,$(js-destwebdir),g' $(html-examples)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet-markercluster.git



More information about the Pkg-javascript-commits mailing list