[routino] 02/05: Update web_path patch to use the default paths during the build and custom paths otherwise.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository routino.

commit fc87cc3c273b7727d2fa4048348b2e1f062b2997
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 17 20:08:23 2015 +0200

    Update web_path patch to use the default paths during the build and custom paths otherwise.
---
 debian/patches/series   |  2 +-
 debian/patches/web_path | 55 ++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 6b18bf9..8dd993f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@ r1801-Dont-create-the-.so-files-on-Windows.patch
 r1803-Add-a-SONAME-shared-library-version-number.patch
 install_path
 rename_router
-#web_path
+web_path
 maploader
 mapprops
 hardening
diff --git a/debian/patches/web_path b/debian/patches/web_path
index 1d6da63..23a68c4 100644
--- a/debian/patches/web_path
+++ b/debian/patches/web_path
@@ -1,19 +1,60 @@
 Description: Fix for wrong paths in web app
-Author: Uwe Steinmann <uwe at steinmann.cx>
+ During the build process, the default paths need to be used for
+ update-profiles.pl to succeed. After installation the custom paths
+ are used instead.
+Author: Uwe Steinmann <uwe at steinmann.cx>, Bas Couwenberg <sebastic at debian.org>
 Forwarded: not-needed
 
 --- a/web/www/routino/paths.pl
 +++ b/web/www/routino/paths.pl
-@@ -22,10 +22,10 @@
- # Directory path parameters
+@@ -23,9 +23,11 @@
  
  # EDIT THIS to set the root directory for the non-web data files.
--$root_dir="../..";
-+$root_dir="/var/lib/routino";
+ $root_dir="../..";
++$root_dir="/var/lib/routino"	if(!$ENV{MODE} || $ENV{MODE} ne 'build');
  
  # EDIT THIS to change the location of the individual directories.
--$bin_dir="$root_dir/bin";
-+$bin_dir="/usr/bin";
+ $bin_dir="$root_dir/bin";
++$bin_dir="/usr/bin"		if(!$ENV{MODE} || $ENV{MODE} ne 'build');
  $data_dir="$root_dir/data";
  $results_dir="$root_dir/results";
  
+--- a/web/Makefile
++++ b/web/Makefile
+@@ -104,7 +104,7 @@ all-profiles: all-exe all-data
+ 	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.pl ] || \
+ 	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.js ]; then \
+ 	    echo update-profiles.pl ;\
+-	    ( cd $(WEBWWWDIR) ; perl update-profiles.pl ) ;\
++	    ( cd $(WEBWWWDIR) ; MODE=build perl update-profiles.pl ) ;\
+ 	 fi
+ 
+ ####
+@@ -137,15 +137,15 @@ endif
+ 
+ $(WEBWWWDIR)/router.html.en: $(WEBTRANSDIR)/router.html $(TRANS_FILES) $(WEBTRANSDIR)/translate.pl
+ 	@echo translate.pl
+-	@cd $(WEBTRANSDIR) && perl translate.pl
++	@cd $(WEBTRANSDIR) && MODE=build perl translate.pl
+ 
+ $(WEBWWWDIR)/visualiser.html.en: $(WEBTRANSDIR)/visualiser.html $(TRANS_FILES) $(WEBTRANSDIR)/translate.pl
+ 	@echo translate.pl
+-	@cd $(WEBTRANSDIR) && perl translate.pl
++	@cd $(WEBTRANSDIR) && MODE=build perl translate.pl
+ 
+ $(XMLDIR)/routino-translations.xml: $(WEBTRANSDIR)/translations-head.xml $(WEBTRANSDIR)/translations-body.xml $(WEBTRANSDIR)/translations-tail.xml $(TRANS_FILES) $(WEBTRANSDIR)/translate.pl
+ 	@echo translate.pl
+-	@cd $(WEBTRANSDIR) && perl translate.pl
++	@cd $(WEBTRANSDIR) && MODE=build perl translate.pl
+ 
+ ####
+ 
+@@ -153,7 +153,7 @@ all-icons: $(WEBICONDIR)/ball-0.png
+ 
+ $(WEBICONDIR)/ball-0.png: $(WEBICONDIR)/create-icons.pl
+ 	@echo create-icons.pl
+-	@cd $(WEBICONDIR) && perl create-icons.pl
++	@cd $(WEBICONDIR) && MODE=build perl create-icons.pl
+ 
+ ####
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/routino.git