s|*CC*|@CC@|g
s|*CFLAGS*|@CFLAGS@|g
s|*CPP*|@CPP@|g
+s|*CPPFLAGS*|@CPPFLAGS@|g
s|*CXX*|@CXX@|g
s|*CXXFLAGS*|@CXXFLAGS@|g
s|*CXXCPP*|@CXXCPP@|g
s|*LN_S*|@LN_S@|g
s|*prefix*|@prefix@|g
s|*exec_prefix*|@exec_prefix@|g
+s|*libdir*|@libdir@|g
s|*bindir*|@bindir@|g
-s|*datadir*|@datadir@|g
-s|*infodir*|@infodir@|g
+s|*includedir*|@includedir@|g
s|*X_CFLAGS*|@X_CFLAGS@|g
s|*X_LIBS*|@X_LIBS@|g
s|*X_EXTRA_LIBS*|@X_EXTRA_LIBS@|g
s|*GUI_TK_INCLUDE*|@GUI_TK_INCLUDE@|g
s|*GUI_TK_LIBRARY*|@GUI_TK_LIBRARY@|g
s|*GUI_TK_LINK*|@GUI_TK_LINK@|g
+s|*WX_LINK*|@WX_LINK@|g
s|*DL_LIBRARY*|@DL_LIBRARY@|g
s|*OPENGL_INCLUDE*|@OPENGL_INCLUDE@|g
s|*OPENGL_LIBRARY*|@OPENGL_LIBRARY@|g
s|*EXTRA_LINK*|@EXTRA_LINK@|g
s|*GTK_JOYSTICK*|@GTK_JOYSTICK@|g
s|*UNIX_THREAD*|@UNIX_THREAD@|g
+s|*IODBC_C_SRC*|@IODBC_C_SRC@|g