#----------------------------------------------------------------------
# General configuration
-PACKAGE := @PACKAGE@
-VERSION := @VERSION@
+PACKAGE := @PACKAGE_NAME@
+VERSION := @PACKAGE_VERSION@
HAVE_PERLDOC := @HAVE_PERLDOC@
HAVE_QEMU := @HAVE_QEMU@