Skip to content
Snippets Groups Projects
Commit efec71da authored by godog's avatar godog
Browse files

Move to versionless php

parent e6baec4a
No related branches found
No related tags found
No related merge requests found
...@@ -1690,7 +1690,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ...@@ -1690,7 +1690,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "${with_php+set}" = set; then : if test "${with_php+set}" = set; then :
withval=$with_php; php_bin="$withval" withval=$with_php; php_bin="$withval"
else else
for ac_prog in php5-cli php5 php for ac_prog in php php-cli
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
......
...@@ -5,7 +5,7 @@ AC_ARG_WITH(php, ...@@ -5,7 +5,7 @@ AC_ARG_WITH(php,
AC_HELP_STRING([[--with-php=BINARY]], AC_HELP_STRING([[--with-php=BINARY]],
[Path to the PHP interpreter]), [Path to the PHP interpreter]),
[php_bin="$withval"], [php_bin="$withval"],
[AC_PATH_PROGS(php_bin, [php5-cli php5 php], [no], [])] [AC_PATH_PROGS(php_bin, [php php-cli], [no], [])]
) )
if test "$php_bin" = "no" ; then if test "$php_bin" = "no" ; then
AC_MSG_ERROR(No PHP interpreter could be found) AC_MSG_ERROR(No PHP interpreter could be found)
...@@ -43,7 +43,7 @@ inst_prefix="$prefix" ...@@ -43,7 +43,7 @@ inst_prefix="$prefix"
if test "$prefix" = "NONE" ; then if test "$prefix" = "NONE" ; then
inst_prefix="$ac_default_prefix" inst_prefix="$ac_default_prefix"
fi fi
NOBLOGS_LIB_DIR="$inst_prefix/lib/noblogs-cli" NOBLOGS_LIB_DIR="$inst_prefix/lib/noblogs-cli"
AC_SUBST(NOBLOGS_LIB_DIR) AC_SUBST(NOBLOGS_LIB_DIR)
NOBLOGS_BIN_DIR="$inst_prefix/bin" NOBLOGS_BIN_DIR="$inst_prefix/bin"
......
...@@ -7,6 +7,6 @@ Standards-Version: 3.9.5 ...@@ -7,6 +7,6 @@ Standards-Version: 3.9.5
Package: noblogs-cli Package: noblogs-cli
Architecture: all Architecture: all
Depends: php5-cli, ${shlibs:Depends}, ${misc:Depends} Depends: php-cli, ${shlibs:Depends}, ${misc:Depends}
Description: Command-line tool to manage noblogs. Description: Command-line tool to manage noblogs.
CLI tool to perform various maintenance tasks on a noblogs installation. CLI tool to perform various maintenance tasks on a noblogs installation.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment