fix PROGSUFFIX handling - close #29

lib/rscons/builder.rb

@@ -36,6 +36,8 @@ module Rscons
     #   The user-supplied target name.
     # @option options [Array<String>] :sources
     #   The user-supplied source file name(s).
+    # @option options [Hash,VarSet] :vars
+    #   Extra construction variables.
     #
     # @return [BuildTarget]
     def create_build_target(options)

lib/rscons/builders/program.rb

@@ -39,9 +39,10 @@ module Rscons
       #
       # @return [BuildTarget]
       def create_build_target(options)
+        env, target, vars = options.values_at(:env, :target, :vars)
         my_options = options.dup
-        unless my_options[:target] =~ /\./
-          my_options[:target] += options[:env].expand_varref("${PROGSUFFIX}")
+        unless env.expand_varref(target, vars) =~ /\./
+          my_options[:target] += env.expand_varref("${PROGSUFFIX}", vars)
         end
         super(my_options)
       end

lib/rscons/environment.rb

@@ -409,7 +409,7 @@ module Rscons
         end
         sources = Array(sources)
         builder = @builders[method.to_s]
-        build_target = builder.create_build_target(env: self, target: target, sources: sources)
+        build_target = builder.create_build_target(env: self, target: target, sources: sources, vars: vars)
         add_target(build_target.to_s, builder, sources, vars || {}, rest)
         build_target
       else