ompi/tools/wrappers/ompi_wrapper_script.in: add missing variable name prefixes

When open-mpi is compiled with script wrapper compilers option:

    ./configure --enable-script-wrapper-compilers ...

The generated wrappers emit warnings:

    Use of uninitialized value $cppflags in substitution (s///) at ./mpicc line 67.
    Use of uninitialized value $cflags in substitution (s///) at ./mpicc line 68.
    Use of uninitialized value $cflags_prefix in substitution (s///) at ./mpicc line 69.
    Use of uninitialized value $cxxflags in substitution (s///) at ./mpicc line 70.
    Use of uninitialized value $cxxflags_prefix in substitution (s///) at ./mpicc line 71.
    Use of uninitialized value $fcflags in substitution (s///) at ./mpicc line 72.
    Use of uninitialized value $fcflags_prefix in substitution (s///) at ./mpicc line 73.
    Use of uninitialized value $ldflags in substitution (s///) at ./mpicc line 74.
    Use of uninitialized value $ldflags_static in substitution (s///) at ./mpicc line 75.
    Use of uninitialized value $fc_ldflags in substitution (s///) at ./mpicc line 78.
    Use of uninitialized value $fc_ldflags_static in substitution (s///) at ./mpicc line 79.
    Use of uninitialized value $fc_libs in substitution (s///) at ./mpicc line 80.
    Use of uninitialized value $fc_libs_static in substitution (s///) at ./mpicc line 81.

Commit 1f18b20
"wrappers: Improve static library handling" introduced new global
variables prefixed with "wrapper_".  A block of code to fixup
directories is using variables without the prefix in their names.

This commit fixes this issue by correctly naming the variables.

Signed-off-by: Julien Olivain <ju.o@free.fr>

Author: jolivain

ompi/tools/wrappers/ompi_wrapper_script.in

@@ -64,21 +64,21 @@ my $libs = "";
 my $libs_static = "";
 
 # run flags through regex to fix directories...
-$cppflags =~ s/\$\{includedir\}/$includedir/g;
-$cflags =~ s/\$\{includedir\}/$includedir/g;
-$cflags_prefix =~ s/\$\{includedir\}/$includedir/g;
-$cxxflags =~ s/\$\{includedir\}/$includedir/g;
-$cxxflags_prefix =~ s/\$\{includedir\}/$includedir/g;
-$fcflags =~ s/\$\{includedir\}/$includedir/g;
-$fcflags_prefix =~ s/\$\{includedir\}/$includedir/g;
-$ldflags =~ s/\$\{libdir\}/$libdir/g;
-$ldflags_static =~ s/\$\{libdir\}/$libdir/g;
-$libs =~ s/\$\{libdir\}/$libdir/g;
-$libs_static =~ s/\$\{libdir\}/$libdir/g;
-$fc_ldflags =~ s/\$\{libdir\}/$libdir/g;
-$fc_ldflags_static =~ s/\$\{libdir\}/$libdir/g;
-$fc_libs =~ s/\$\{libdir\}/$libdir/g;
-$fc_libs_static =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_cppflags =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_cflags =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_cflags_prefix =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_cxxflags =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_cxxflags_prefix =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_fcflags =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_fcflags_prefix =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_ldflags =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_ldflags_static =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_libs =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_libs_static =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_fc_ldflags =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_fc_ldflags_static =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_fc_libs =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_fc_libs_static =~ s/\$\{libdir\}/$libdir/g;
 
 sub check_env {
     my $envvar = shift;