4 files changed, 9 insertions, 8 deletions

diff --git a/src/build.cpp b/src/build.cpp
index 88d1207..89366f9 100644
--- a/src/build.cpp
+++ b/src/build.cpp
@@ -144,11 +144,11 @@ void Build::set( const std::string &cont, const std::string &var, const std::str
 {
         if( cont == "" )
         {
-                mVars[var] = val;
+                mVars[var] = replVars( val, cont, NULL );
         }
         else
         {
-                mContVars[cont][var] = val;
+                mContVars[cont][var] = replVars( val, cont, NULL );
         }
 }
 
@@ -156,11 +156,11 @@ void Build::setAdd( const std::string &cont, const std::string &var, const std::
 {
         if( cont == "" )
         {
-                mVars[var] = getVar( cont, var, NULL ) + " " + val;
+                mVars[var] = getVar( cont, var, NULL ) + " " + replVars( val, cont, NULL );
         }
         else
         {
-                mContVars[cont][var] = getVar( cont, var, NULL ) + " " + val;
+                mContVars[cont][var] = getVar( cont, var, NULL ) + " " + replVars( val, cont, NULL );
         }
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index fa1608f..4f0ecca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -50,14 +50,11 @@ public:
         int procViewPercent( int argc, char *argv[] )
         {
                 sView = "percent";
-                //delete pViewer;
-                //pViewer = new ViewerPercent;
         }
 
         int procViewMake( int argc, char *argv[] )
         {
-                //delete pViewer;
-                //pViewer = new ViewerMake;
+                sView = "make";
         }
 
         std::string sCache;
diff --git a/src/performcommand.cpp b/src/performcommand.cpp
index 5a9e746..e901b0e 100644
--- a/src/performcommand.cpp
+++ b/src/performcommand.cpp
@@ -1,6 +1,7 @@
 #include "performcommand.h"
 #include "plugger.h"
 #include "build.h"
+#include "viewer.h"
 
 PluginInterface2(command, PerformCommand, Perform, "Mike Buland", 0, 1 );
 
@@ -21,6 +22,7 @@ Perform *PerformCommand::duplicate( Build &bld, const std::string &cont, VarMap
 
 void PerformCommand::execute( Build &bld )
 {
+        bld.getView()->executeCmd( lParam.front() );
         int n = system( lParam.front().c_str() );
         if( n != 0 )
                 throw BuildException(
diff --git a/src/viewerfactory.cpp b/src/viewerfactory.cpp
index 3dbc232..8024a7e 100644
--- a/src/viewerfactory.cpp
+++ b/src/viewerfactory.cpp
@@ -2,11 +2,13 @@
 
 extern struct PluginInfo plain;
 extern struct PluginInfo percent;
+extern struct PluginInfo make;
 
 ViewerFactory::ViewerFactory()
 {
         registerBuiltinPlugin( &plain );
         registerBuiltinPlugin( &percent );
+        registerBuiltinPlugin( &make );
 }
 
 ViewerFactory::~ViewerFactory()