diff --git a/configure.ac b/configure.ac index 73eacb5..08d9d23 100644 --- a/configure.ac +++ b/configure.ac @@ -415,10 +415,19 @@ case "$host" in else AC_DEFINE(HAVE_PHP) EXTENSIONS="$EXTENSIONS php" + PHPMAJOR=`$PHPCONFIG --version | cut -d. -f1` + if test -d /etc/php${PHPMAJOR}/conf.d; then + PHPCONFDIR=/etc/php${PHPMAJOR}/conf.d + else + PHPCONFDIR=/etc/php${PHPMAJOR}/cli + fi fi + esac AC_SUBST(PHPCONFIG) +AC_SUBST(PHPMAJOR) +AC_SUBST(PHPCONFDIR) #--[ ooRexx ]----------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/src/php/Makefile.in b/src/php/Makefile.in index 9498a58..3d80aad 100644 --- a/src/php/Makefile.in +++ b/src/php/Makefile.in @@ -113,8 +113,8 @@ install: $(BINDBG)/php3270@DLLEXT@ @$(MKDIR) $(DESTDIR)/`$(PHPCONFIG) --extension-dir` @$(INSTALL_PROGRAM) $(BINDBG)/php3270@DLLEXT@ $(DESTDIR)/`$(PHPCONFIG) --extension-dir`/tn3270@DLLEXT@ - @$(MKDIR) $(DESTDIR)/$(sysconfdir)/php`$(PHPCONFIG) --version | cut -d. -f1`/conf.d - @$(INSTALL_DATA) php.ini $(DESTDIR)/$(sysconfdir)/php`$(PHPCONFIG) --version | cut -d. -f1`/conf.d/tn3270.ini + @$(MKDIR) $(DESTDIR)/@PHPCONFDIR@ + @$(INSTALL_DATA) php.ini $(DESTDIR)/@PHPCONFDIR@/tn3270.ini cleanDebug: clean -- libgit2 0.21.2