aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-03-07 22:55:02 -0500
committerRalph Amissah <ralph@amissah.com>2013-03-07 22:55:02 -0500
commit5ca9a5a24e3b9b90339770ad85e9cbaa539f0957 (patch)
tree856f01438e2d6597a18fab123732531337c0a317
parentv4: share_src, sisu source, permissions, make world readable when shared (diff)
v4: manifest, sysenv, manifests sisupod relative link for output_by language
-rw-r--r--data/doc/sisu/CHANGELOG_v42
-rw-r--r--lib/sisu/v4/manifest.rb2
-rw-r--r--lib/sisu/v4/sysenv.rb2
3 files changed, 4 insertions, 2 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 2ef62c1d..e60d12bc 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.12.orig.tar.xz
* v4: share_src, sisu source, permissions, make world readable when shared
+* v4: manifest, sysenv, manifests sisupod relative link for output_by language
+
%% 4.0.11.orig.tar.xz (2013-03-06:09/3)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.11
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.11-1
diff --git a/lib/sisu/v4/manifest.rb b/lib/sisu/v4/manifest.rb
index d7c4d33a..cb34a3d3 100644
--- a/lib/sisu/v4/manifest.rb
+++ b/lib/sisu/v4/manifest.rb
@@ -497,7 +497,7 @@ WOK
end
if FileTest.file?(@f.place_file.sisupod.dir)==true
pth=@f.output_path.sisupod.dir
- rel=@f.output_path.sisupod.ab_pod
+ rel=@f.output_path.sisupod.rel_sm
url=@f.output_path.sisupod.url
id,file='SiSU doc (tar.xz)',@f.base_filename.sisupod
summarize_sources(id,file,pth,rel,url)
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index f3191be1..581eb0d5 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -4928,7 +4928,7 @@ WOK
if output_dir_structure.dump_or_redirect?
'.'
elsif output_dir_structure.by_language_code?
- "../../#{@ft}/#{@md.opt.lng}"
+ "../../#{@ft}"
else
"../#{@ft}"
end