Download as
Browse Code »

Commit 34443ac13f029f3d9ddc6e450aae2407c9afc4f5

Authored by perry.werneck@gmail.com
1 parent 31723167
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustando detecção do diretório de configuração do php

Showing 2 changed files with 11 additions and 2 deletions   Show diff stats
@@ -415,10 +415,19 @@ case "$host" in @@ -415,10 +415,19 @@ case "$host" in
415 else 415 else
416 AC_DEFINE(HAVE_PHP) 416 AC_DEFINE(HAVE_PHP)
417 EXTENSIONS="$EXTENSIONS php" 417 EXTENSIONS="$EXTENSIONS php"
  418 + PHPMAJOR=`$PHPCONFIG --version | cut -d. -f1`
  419 + if test -d /etc/php${PHPMAJOR}/conf.d; then
  420 + PHPCONFDIR=/etc/php${PHPMAJOR}/conf.d
  421 + else
  422 + PHPCONFDIR=/etc/php${PHPMAJOR}/cli
  423 + fi
418 fi 424 fi
  425 +
419 esac 426 esac
420 427
421 AC_SUBST(PHPCONFIG) 428 AC_SUBST(PHPCONFIG)
  429 +AC_SUBST(PHPMAJOR)
  430 +AC_SUBST(PHPCONFDIR)
422 431
423 #--[ ooRexx ]----------------------------------------------------------------------------------------------------------------------------------------------- 432 #--[ ooRexx ]-----------------------------------------------------------------------------------------------------------------------------------------------
424 433
src/php/Makefile.in
  Diff comments   View file @34443ac
@@ -113,8 +113,8 @@ install: $(BINDBG)/php3270@DLLEXT@ @@ -113,8 +113,8 @@ install: $(BINDBG)/php3270@DLLEXT@
113 @$(MKDIR) $(DESTDIR)/`$(PHPCONFIG) --extension-dir` 113 @$(MKDIR) $(DESTDIR)/`$(PHPCONFIG) --extension-dir`
114 @$(INSTALL_PROGRAM) $(BINDBG)/php3270@DLLEXT@ $(DESTDIR)/`$(PHPCONFIG) --extension-dir`/tn3270@DLLEXT@ 114 @$(INSTALL_PROGRAM) $(BINDBG)/php3270@DLLEXT@ $(DESTDIR)/`$(PHPCONFIG) --extension-dir`/tn3270@DLLEXT@
115 115
116 - @$(MKDIR) $(DESTDIR)/$(sysconfdir)/php`$(PHPCONFIG) --version | cut -d. -f1`/conf.d  
117 - @$(INSTALL_DATA) php.ini $(DESTDIR)/$(sysconfdir)/php`$(PHPCONFIG) --version | cut -d. -f1`/conf.d/tn3270.ini 116 + @$(MKDIR) $(DESTDIR)/@PHPCONFDIR@
  117 + @$(INSTALL_DATA) php.ini $(DESTDIR)/@PHPCONFDIR@/tn3270.ini
118 118
119 cleanDebug: clean 119 cleanDebug: clean
120 120