diff --git a/libs/openzap/Makefile.am b/libs/openzap/Makefile.am
index 673f03936b..dd0fb0cb88 100644
--- a/libs/openzap/Makefile.am
+++ b/libs/openzap/Makefile.am
@@ -29,30 +29,18 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-CC = @CC@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-DEFS = @DEFS@
 CFLAGS=@CFLAGS@ @COMP_VENDOR_CFLAGS@ @DEFS@
 
 ###For libpcap
 CFLAGS+= -D_GNU_SOURCE
 ####
 
-LIBS = @LIBS@
-
 ###For libpcap
 LIBS+= -lpcap
 ####
 
-DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
-SOLINK = @SOLINK@
-OZ_SRCDIR=@oz_srcdir@
-oz_builddir=@oz_builddir@
 SRC=src
 top_builddir=@oz_builddir@
-INSTALL=@INSTALL@
-LIBTOOL=@LIBTOOL@
 LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL)
 LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f 
 CCLD = $(CC)
diff --git a/libs/openzap/configure.ac b/libs/openzap/configure.ac
index 653bd01d2d..471030debf 100644
--- a/libs/openzap/configure.ac
+++ b/libs/openzap/configure.ac
@@ -16,9 +16,9 @@ AC_PREFIX_DEFAULT(/usr/local/openzap)
 
 
 # Absolute source/build directory
-oz_srcdir=`(cd $srcdir && pwd)`
+OZ_SRCDIR=`(cd $srcdir && pwd)`
 oz_builddir=`pwd`
-AC_SUBST(oz_srcdir)
+AC_SUBST(OZ_SRCDIR)
 AC_SUBST(oz_builddir)
 
 #override some default libtool behavior and invoke AC_PROG_LIBTOOL (see http://lists.gnu.org/archive/html/libtool/2007-03/msg00000.html)