From d27a4f86ea5a1c57bedb0ba621612f21a38fae81 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Mon, 8 Oct 2012 17:19:42 +0400
Subject: [PATCH] Ticket #2888: cleanups in master branch.

Check perl, python and ruby programs and substitute them in various files.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 configure.ac                                |  4 ++++
 doc/man/date-of-man-include.am              |  2 +-
 misc/syntax/Makefile.am                     | 11 ++++++++---
 misc/syntax/{Syntax => Syntax.in}           |  2 +-
 src/vfs/extfs/helpers/Makefile.am           |  4 +++-
 src/vfs/extfs/helpers/s3+.in                |  2 +-
 src/vfs/extfs/helpers/{uc1541 => uc1541.in} |  2 +-
 7 files changed, 19 insertions(+), 8 deletions(-)
 rename misc/syntax/{Syntax => Syntax.in} (99%)
 rename src/vfs/extfs/helpers/{uc1541 => uc1541.in} (99%)
 mode change 100755 => 100644

diff --git a/configure.ac b/configure.ac
index f7e16c6d9..2ea4e1fb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,8 @@ PKG_PROG_PKG_CONFIG
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PATH_PROG([PERL], [perl], [/usr/bin/perl])
+AC_PATH_PROG([PYTHON], [python], [/usr/bin/python])
+AC_PATH_PROG([RUBY], [ruby], [/usr/bin/ruby])
 
 dnl Check nroff and the options it supports
 AC_CHECK_PROG(HAVE_nroff, nroff, true, false)
@@ -564,6 +566,7 @@ src/vfs/extfs/helpers/ualz
 src/vfs/extfs/helpers/uar
 src/vfs/extfs/helpers/uarc
 src/vfs/extfs/helpers/uarj
+src/vfs/extfs/helpers/uc1541
 src/vfs/extfs/helpers/ucab
 src/vfs/extfs/helpers/uha
 src/vfs/extfs/helpers/ulha
@@ -603,6 +606,7 @@ lib/vfs/Makefile
 lib/widget/Makefile
 
 misc/syntax/Makefile
+misc/syntax/Syntax
 
 doc/Makefile
 doc/hints/Makefile
diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am
index 9697b9778..5fd6e8e85 100644
--- a/doc/man/date-of-man-include.am
+++ b/doc/man/date-of-man-include.am
@@ -5,7 +5,7 @@ SED_PARAMETERS = \
 	-e "s{%sysconfdir%{@sysconfdir@{g"
 
 MAN_DATE_CMD = \
-	LC_ALL=$(DATE_LANG) perl -MPOSIX -e '\
+	LC_ALL=$(DATE_LANG) @PERL@ -MPOSIX -e '\
 	    @fi=lstat("'$${MAN_FILE}'"); \
 	    print POSIX::strftime("$(DATE_FORMAT)", localtime($$fi[9]));' 2>/dev/null
 
diff --git a/misc/syntax/Makefile.am b/misc/syntax/Makefile.am
index 6bb62ca7e..6f5c3bffc 100644
--- a/misc/syntax/Makefile.am
+++ b/misc/syntax/Makefile.am
@@ -1,5 +1,8 @@
+SYNTAX_IN = Syntax.in
+
+SYNTAX_OUT = Syntax
+
 SYNTAXFILES =			\
-	Syntax			\
 	PKGBUILD.syntax		\
 	ada95.syntax		\
 	as.syntax		\
@@ -76,7 +79,9 @@ SYNTAXFILES =			\
 
 if USE_EDIT
 syntaxdir =		$(pkgdatadir)/syntax
-syntax_DATA =		$(SYNTAXFILES)
+syntax_DATA =		$(SYNTAX_OUT) \
+			$(SYNTAXFILES)
 endif
 
-EXTRA_DIST =		$(SYNTAXFILES)
+EXTRA_DIST =		$(SYNTAX_IN) \
+			$(SYNTAXFILES)
diff --git a/misc/syntax/Syntax b/misc/syntax/Syntax.in
similarity index 99%
rename from misc/syntax/Syntax
rename to misc/syntax/Syntax.in
index 44fe5dd58..6e53ad20a 100644
--- a/misc/syntax/Syntax
+++ b/misc/syntax/Syntax.in
@@ -171,7 +171,7 @@ include po.syntax
 
 file ..\*\\.([Aa][Ss][Mm]|s|S)$ ASM\sProgram
 include assembler.syntax
- 
+
 file ..\*\\.([Pp][Oo][Vv])$ POV\sScript
 include povray.syntax
 
diff --git a/src/vfs/extfs/helpers/Makefile.am b/src/vfs/extfs/helpers/Makefile.am
index 53184c0c5..06ea7898d 100644
--- a/src/vfs/extfs/helpers/Makefile.am
+++ b/src/vfs/extfs/helpers/Makefile.am
@@ -6,7 +6,7 @@ EXTFSCONFFILES = sfs.ini
 EXTFS_MISC  = README README.extfs
 
 # Scripts hat don't need adaptation to the local system
-EXTFS_CONST = bpp changesetfs gitfs+ patchsetfs rpm trpm uc1541 u7z
+EXTFS_CONST = bpp changesetfs gitfs+ patchsetfs rpm trpm u7z
 
 # Scripts that need adaptation to the local system - source files
 EXTFS_IN    = 			\
@@ -29,6 +29,7 @@ EXTFS_IN    = 			\
 	uar.in			\
 	uarc.in			\
 	uarj.in			\
+	uc1541.in		\
 	ucab.in			\
 	uha.in			\
 	ulha.in			\
@@ -58,6 +59,7 @@ EXTFS_OUT = 			\
 	uar			\
 	uarc			\
 	uarj			\
+	uc1541			\
 	ucab			\
 	uha			\
 	ulha			\
diff --git a/src/vfs/extfs/helpers/s3+.in b/src/vfs/extfs/helpers/s3+.in
index 805872b50..520516983 100644
--- a/src/vfs/extfs/helpers/s3+.in
+++ b/src/vfs/extfs/helpers/s3+.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#! @PYTHON@
 # -*- coding: utf-8 -*-
 
 #
diff --git a/src/vfs/extfs/helpers/uc1541 b/src/vfs/extfs/helpers/uc1541.in
old mode 100755
new mode 100644
similarity index 99%
rename from src/vfs/extfs/helpers/uc1541
rename to src/vfs/extfs/helpers/uc1541.in
index 9e6b49b54..4f7a14ee5
--- a/src/vfs/extfs/helpers/uc1541
+++ b/src/vfs/extfs/helpers/uc1541.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! @PYTHON@
 """
 UC1541 Virtual filesystem