diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-02-03 21:25:47 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-02-03 21:31:46 -0500 |
| commit | 3c26df4df6047219869203bb71680248a37c59b4 (patch) | |
| tree | 22edfdc010abdb2583ba0bfd652786a2ba24270a | |
| parent | v4 (v3): version & changelog (diff) | |
v4 (v3): sysenv, on --redirect, stop creation of redundant dir
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 2 | ||||
| -rw-r--r-- | lib/sisu/v3/sysenv.rb | 3 | ||||
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 31166647..5bb22bd9 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -35,6 +35,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.8.orig.tar.xz sisu_3.3.8.orig.tar.xz sisu_3.3.8-1.dsc +* v3: sysenv, on --redirect, stop creation of redundant dir + %% 3.3.7.orig.tar.xz (2013-01-31:04/4) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.7 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.7.orig.tar.xz diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index a24f1e0b..de1d868e 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -24,6 +24,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.5.orig.tar.xz sisu_4.0.5.orig.tar.xz sisu_4.0.5-1.dsc +* v4: sysenv, on --redirect, stop creation of redundant dir + %% 4.0.4.orig.tar.xz (2013-01-31:04/4) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.4 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.4-1 diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index bfe35c5d..8ed17f88 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -4106,7 +4106,8 @@ WOK end def html_segtoc pth=((by_filename?) \ - || (output_dir_structure.dump?)) \ + || (output_dir_structure.dump?) \ + || (output_dir_structure.redirect?)) \ ? "#{output_path.html.dir}" : "#{output_path.html.dir}/#{@md.fnb}" fn=base_filename.html_segtoc diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index 2b36a222..d8b6f4fd 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -4208,7 +4208,8 @@ WOK end def html_segtoc pth=((by_filename?) \ - || (output_dir_structure.dump?)) \ + || (output_dir_structure.dump?) \ + || (output_dir_structure.redirect?)) \ ? "#{output_path.html.dir}" : "#{output_path.html.dir}/#{@md.fnb}" fn=base_filename.html_segtoc |