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>
This commit is contained in:
Andrew Borodin 2012-10-08 17:19:42 +04:00
parent ef9d337d6f
commit d27a4f86ea
7 changed files with 19 additions and 8 deletions

View File

@ -56,6 +56,8 @@ PKG_PROG_PKG_CONFIG
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PATH_PROG([PERL], [perl], [/usr/bin/perl]) 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 dnl Check nroff and the options it supports
AC_CHECK_PROG(HAVE_nroff, nroff, true, false) 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/uar
src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarc
src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uarj
src/vfs/extfs/helpers/uc1541
src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/ucab
src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/uha
src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulha
@ -603,6 +606,7 @@ lib/vfs/Makefile
lib/widget/Makefile lib/widget/Makefile
misc/syntax/Makefile misc/syntax/Makefile
misc/syntax/Syntax
doc/Makefile doc/Makefile
doc/hints/Makefile doc/hints/Makefile

View File

@ -5,7 +5,7 @@ SED_PARAMETERS = \
-e "s{%sysconfdir%{@sysconfdir@{g" -e "s{%sysconfdir%{@sysconfdir@{g"
MAN_DATE_CMD = \ MAN_DATE_CMD = \
LC_ALL=$(DATE_LANG) perl -MPOSIX -e '\ LC_ALL=$(DATE_LANG) @PERL@ -MPOSIX -e '\
@fi=lstat("'$${MAN_FILE}'"); \ @fi=lstat("'$${MAN_FILE}'"); \
print POSIX::strftime("$(DATE_FORMAT)", localtime($$fi[9]));' 2>/dev/null print POSIX::strftime("$(DATE_FORMAT)", localtime($$fi[9]));' 2>/dev/null

View File

@ -1,5 +1,8 @@
SYNTAX_IN = Syntax.in
SYNTAX_OUT = Syntax
SYNTAXFILES = \ SYNTAXFILES = \
Syntax \
PKGBUILD.syntax \ PKGBUILD.syntax \
ada95.syntax \ ada95.syntax \
as.syntax \ as.syntax \
@ -76,7 +79,9 @@ SYNTAXFILES = \
if USE_EDIT if USE_EDIT
syntaxdir = $(pkgdatadir)/syntax syntaxdir = $(pkgdatadir)/syntax
syntax_DATA = $(SYNTAXFILES) syntax_DATA = $(SYNTAX_OUT) \
$(SYNTAXFILES)
endif endif
EXTRA_DIST = $(SYNTAXFILES) EXTRA_DIST = $(SYNTAX_IN) \
$(SYNTAXFILES)

View File

@ -6,7 +6,7 @@ EXTFSCONFFILES = sfs.ini
EXTFS_MISC = README README.extfs EXTFS_MISC = README README.extfs
# Scripts hat don't need adaptation to the local system # 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 # Scripts that need adaptation to the local system - source files
EXTFS_IN = \ EXTFS_IN = \
@ -29,6 +29,7 @@ EXTFS_IN = \
uar.in \ uar.in \
uarc.in \ uarc.in \
uarj.in \ uarj.in \
uc1541.in \
ucab.in \ ucab.in \
uha.in \ uha.in \
ulha.in \ ulha.in \
@ -58,6 +59,7 @@ EXTFS_OUT = \
uar \ uar \
uarc \ uarc \
uarj \ uarj \
uc1541 \
ucab \ ucab \
uha \ uha \
ulha \ ulha \

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #! @PYTHON@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #

View File

@ -1,4 +1,4 @@
#! /usr/bin/env python #! @PYTHON@
""" """
UC1541 Virtual filesystem UC1541 Virtual filesystem