[SCM] calf/master: Fix documentation install path.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Feb 22 09:44:16 UTC 2016


The following commit has been merged in the master branch:
commit cda1ab00b275c79a0db12ffbf9163443b4fb1175
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Feb 21 22:17:05 2016 +0100

    Fix documentation install path.

diff --git a/debian/rules b/debian/rules
index b0e3dce..5ab8e79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 pkg = calf-plugins
-docdir = /usr/share/doc/$(pkg)
+docdir = /usr/share/calf/doc
 
 DEB_UPSTREAM_URL = https://github.com/calf-studio-gear/calf/archive
 DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_TARBALL_VERSION)
@@ -81,7 +81,7 @@ clean::
 	rm -rf m4
 
 # adjust location of documentation
-DEB_CONFIGURE_EXTRA_FLAGS += --htmldir=$(docdir)/html
+DEB_CONFIGURE_EXTRA_FLAGS += --docdir=$(docdir)
 
 install/$(pkg)::
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
@@ -96,9 +96,11 @@ LDFLAGS += -Wl,--as-needed
 CDBS_BUILD_DEPENDS +=, libjs-jquery, libjs-jquery-colorbox
 CDBS_DEPENDS_$(pkg) = libjs-jquery, libjs-jquery-colorbox
 binary-post-install/$(pkg)::
-	rm -f $(cdbs_curdestdir)$(docdir)/html/scripts/jquery.js
-	ln -sT ../../../../javascript/jquery/jquery.min.js \
-		$(cdbs_curdestdir)$(docdir)/html/scripts/jquery.js
-	rm -f $(cdbs_curdestdir)$(docdir)/html/scripts/jquery.prettyPhoto.js
-	ln -sT ../../../../javascript/jquery-colorbox/jquery.colorbox-min.js \
-		$(cdbs_curdestdir)$(docdir)/html/scripts/jquery.prettyPhoto.js
+#	rm -f $(cdbs_curdestdir)$(docdir)/scripts/jquery.js
+	ln -fsT ../../../javascript/jquery/jquery.min.js \
+		$(cdbs_curdestdir)$(docdir)/scripts/jquery.js
+#	rm -f $(cdbs_curdestdir)$(docdir)/scripts/jquery.prettyPhoto.js
+	ln -fsT ../../../javascript/jquery-colorbox/jquery.colorbox-min.js \
+		$(cdbs_curdestdir)$(docdir)/scripts/jquery.prettyPhoto.js
+	ln -fsT ../../calf/doc \
+		$(cdbs_curdestdir)usr/share/doc/$(pkg)/html

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list