diff --git a/configure b/configure
index b840ce37..d761ae85 100755
--- a/configure
+++ b/configure
@@ -5936,9 +5936,6 @@ LIBDIR=`eval echo \`eval echo $libdir\``
 LIBEXECDIR=`eval echo $libexecdir`
 LOCALSTATEDIR=`eval echo $localstatedir`
 
-CPPFLAGS="-I${INCLUDEDIR} ${CPPFLAGS}"
-LDFLAGS="-L${LIBDIR} ${LDFLAGS}"
-
 # This is for cligen
 
 # Check whether --with-cligen was given.
@@ -5952,8 +5949,8 @@ fi
 
 if test -n "${CLIGEN_DIR}" -a -d "${CLIGEN_DIR}"; then
     echo "Using CLIGEN here: ${CLIGEN_DIR}"
-    CPPFLAGS="-I${CLIGEN_DIR}${INCLUDEDIR} ${CPPFLAGS}"
-    LDFLAGS="-L${CLIGEN_DIR}${LIBDIR} ${LDFLAGS}"
+    CPPFLAGS="-I${CLIGEN_DIR}/include ${CPPFLAGS}"
+    LDFLAGS="-L${CLIGEN_DIR}/lib ${LDFLAGS}"
 fi
 
 # Disable/enable yang patch
diff --git a/configure.ac b/configure.ac
index 32257bc5..e6e7ae63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,9 +194,6 @@ LIBDIR=`eval echo \`eval echo $libdir\``
 LIBEXECDIR=`eval echo $libexecdir`
 LOCALSTATEDIR=`eval echo $localstatedir`
 
-CPPFLAGS="-I${INCLUDEDIR} ${CPPFLAGS}"
-LDFLAGS="-L${LIBDIR} ${LDFLAGS}"
-
 # This is for cligen
 AC_ARG_WITH([cligen], [AS_HELP_STRING([--with-cligen=dir], [Use CLIGEN installation in this dir])], [
   CLIGEN_DIR="$withval"
@@ -204,8 +201,8 @@ AC_ARG_WITH([cligen], [AS_HELP_STRING([--with-cligen=dir], [Use CLIGEN installat
 AC_SUBST(CLIGEN_DIR)
 if test -n "${CLIGEN_DIR}" -a -d "${CLIGEN_DIR}"; then
     echo "Using CLIGEN here: ${CLIGEN_DIR}"
-    CPPFLAGS="-I${CLIGEN_DIR}${INCLUDEDIR} ${CPPFLAGS}"
-    LDFLAGS="-L${CLIGEN_DIR}${LIBDIR} ${LDFLAGS}"
+    CPPFLAGS="-I${CLIGEN_DIR}/include ${CPPFLAGS}"
+    LDFLAGS="-L${CLIGEN_DIR}/lib ${LDFLAGS}"
 fi
 
 # Disable/enable yang patch