@@ -27,6 +27,18 @@ my @client_program_files = (
2727' pg_isready' ' pg_receivexlog' ' pg_restore' ' psql'
2828' reindexdb' ' vacuumdb' @client_contribs );
2929
30+ sub SubstituteMakefileVariables {
31+ local $_ =shift ;# Line to substitue
32+ my $mf =shift ;# Makefile text
33+ while (/ \$\( (\w +)\) /
34+ my $varname =$1 ;
35+ if ($mf =~/ ^$varname \s *=\s *(.*)$ /mg
36+ my $varvalue =$1 ;
37+ s /\$\( $varname\) / $varvalue / g
38+ }
39+ }
40+ return $_ ;
41+ }
3042sub lcopy
3143{
3244my $src =shift ;
@@ -494,8 +506,8 @@ sub CopySubdirFiles
494506}
495507
496508$flist =' '
497- if ($mf =~/ ^DATA_built\s *=\s *(.*)$ /m $flist .=$1 }
498- if ($mf =~/ ^DATA\s *=\s *(.*)$ /m $flist .=" $1 "
509+ if ($mf =~/ ^DATA_built\s *=\s *(.*)$ /m $flist .=$1 ; }
510+ if ($mf =~/ ^DATA\s *=\s *(.*)$ /m $flist .=" $1 " ; }
499511$flist =~s /\s *// # Remove leading spaces if we had only DATA_built
500512
501513if ($flist ne ' '
@@ -516,7 +528,7 @@ sub CopySubdirFiles
516528if ($flist ne ' '
517529{
518530$flist = ParseAndCleanRule($flist ,$mf );
519-
531+ print STDERR " Installing TSEARCH data for module $module : $flist \n " ;
520532foreach my $f (split /\s +/,$flist )
521533{
522534lcopy(" $subdir /$module /$f "
@@ -568,7 +580,7 @@ sub ParseAndCleanRule
568580substr ($flist , 0,index ($flist ,' $(addsuffix'
569581 .substr ($flist ,$i + 1);
570582}
571- return $flist ;
583+ return SubstituteMakefileVariables( $flist , $mf ) ;
572584}
573585
574586sub CopyIncludeFiles