On 12.05.2013 05:22, Allan McRae wrote: > On 12/05/13 02:06, Florian Pritz wrote: >> This allows for somewhat easy templating for PKGBUILDs. >> >> Signed-off-by: Florian Pritz <[email protected]> >> --- >> >> v6: >> - fix indentation of AX_PROG_PERL_VERSION code >> - lots of style fixes for manpage and usage >> >> configure.ac | 19 +++++ >> doc/.gitignore | 1 + >> doc/Makefile.am | 4 + >> doc/makepkg-template.1.txt | 120 +++++++++++++++++++++++++++++ >> scripts/.gitignore | 1 + >> scripts/Makefile.am | 11 +++ >> scripts/makepkg-template.pl.in | 168 >> +++++++++++++++++++++++++++++++++++++++++ >> 7 files changed, 324 insertions(+) >> create mode 100644 doc/makepkg-template.1.txt >> create mode 100755 scripts/makepkg-template.pl.in >> >> diff --git a/configure.ac b/configure.ac >> index 0d08e86..95018df 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -97,6 +97,11 @@ AC_ARG_WITH(buildscript, >> AS_HELP_STRING([--with-buildscript=name], [set the build script name >> used by makepkg]), >> [BUILDSCRIPT=$withval], [BUILDSCRIPT=PKGBUILD]) >> >> +# Help line for buildscript filename >> +AC_ARG_WITH(makepkg-template-dir, >> + AS_HELP_STRING([--with-makepkg-template-dir=name], [set the template >> dir used by makepkg-template]), >> + [TEMPLATE_DIR=$withval], [TEMPLATE_DIR=/usr/share/makepkg-template]) >> + >> # Help line for debug package suffix >> AC_ARG_WITH(debug-suffix, >> AS_HELP_STRING([--with-debug-suffix=name], [set the suffix for split >> debugging symbol packages used by makepkg]), >> @@ -166,6 +171,16 @@ AC_PROG_INSTALL >> AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], >> [false]) >> AC_PATH_PROGS([BASH_SHELL], [bash bash4], [false]) >> >> +# check for perl 5.10.1 (needed by makepkg-template) >> +AC_PATH_PROG([PERL],[perl]) >> +AC_DEFUN([AX_PROG_PERL_VERSION], >> + [AC_CACHE_CHECK([for Perl version $1 or later], >> [ax_cv_prog_perl_version], >> + [AS_IF(["$PERL" -e 'require v$1;' >/dev/null 2>&1], >> + [ax_cv_prog_perl_version=yes], >> + [ax_cv_prog_perl_version=no])]) >> + AS_IF([test x"$ax_cv_prog_perl_version" = xyes], [$2], [$3])]) > > This is still indented unlike anything else in the entire file.
Changed to single tab per indentation level. > Otherwise this is fine. As I mentioned on IRC, we will need to deal > with translations in a subsequent patch, but that will take extra work > given this is perl. > > Allan >
signature.asc
Description: OpenPGP digital signature
