From dfa39a8f7c873657bb9663cb0defecb412bf7f22 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Jul 2015 16:20:20 +0200 Subject: php-pear: fix default values in rpm macro file (instead of undefined) --- macros.pear | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'macros.pear') diff --git a/macros.pear b/macros.pear index 71aacc6..1b6ac7b 100644 --- a/macros.pear +++ b/macros.pear @@ -7,21 +7,21 @@ # # Define PEAR directories used in php-pear-* spec files # -%pear_phpdir %(%{__pear} config-get php_dir 2> /dev/null || echo undefined) -%pear_docdir %(%{__pear} config-get doc_dir 2> /dev/null || echo undefined) -%pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined) -%pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined) -%pear_cfgdir %(%{__pear} config-get cfg_dir 2> /dev/null || echo undefined) -%pear_wwwdir %(%{__pear} config-get www_dir 2> /dev/null || echo undefined) -%@SCL@pear_metadir %(%{__pear} config-get metadata_dir 2> /dev/null || echo undefined) +%pear_phpdir %(%{__pear} config-get php_dir 2> /dev/null || echo @PREFIX@/share/pear) +%pear_docdir %(%{__pear} config-get doc_dir 2> /dev/null || echo @PREFIX@/share/doc/pear) +%pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo @PREFIX@/share/tests/pear) +%pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo @PREFIX@/share/pear-data) +%pear_cfgdir %(%{__pear} config-get cfg_dir 2> /dev/null || echo @ETCDIR@/pear) +%pear_wwwdir %(%{__pear} config-get www_dir 2> /dev/null || echo @VARDIR@/www/html) +%@SCL@pear_metadir %(%{__pear} config-get metadata_dir 2> /dev/null || echo @VARDIR@/lib/pear) # # Define PECL directories used in php-pecl-* spec files: # -%pecl_phpdir %(%{__pecl} config-get php_dir 2> /dev/null || echo undefined) -%pecl_docdir %(%{__pecl} config-get doc_dir 2> /dev/null || echo undefined) -%pecl_testdir %(%{__pecl} config-get test_dir 2> /dev/null || echo undefined) -%pecl_datadir %(%{__pecl} config-get data_dir 2> /dev/null || echo undefined) +%pecl_phpdir %(%{__pecl} config-get php_dir 2> /dev/null || echo @PREFIX@/share/pear) +%pecl_docdir %(%{__pecl} config-get doc_dir 2> /dev/null || echo @PREFIX@/share/doc/pecl) +%pecl_testdir %(%{__pecl} config-get test_dir 2> /dev/null || echo @PREFIX@/share/tests/pecl) +%pecl_datadir %(%{__pecl} config-get data_dir 2> /dev/null || echo @PREFIX@/share/pear-data) # # Define XML directories to store package registration information: -- cgit