X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-top%2FMakefile.in;h=0d0ccdc5d4787221698341a7efe75f4fed477b2c;hp=64c222ebc580dce30496afae708f0abefa74bcf6;hb=d0381948857fa48c1c1e24cac01997a57c067403;hpb=9f869ebd731800a0307842f3997da084a98ffe86

diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
index 64c222e..0d0ccdc 100755
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -25,16 +25,16 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
-pkg_curses	= @pkg_curses@
-pkg_xml_light	= @pkg_xml_light@
-pkg_csv		= @pkg_csv@
-pkg_calendar    = @pkg_calendar@
-pkg_calendar2   = @pkg_calendar2@
-pkg_gettext	= @pkg_gettext@
+OCAML_PKG_curses    = @OCAML_PKG_curses@
+OCAML_PKG_xml_light = @OCAML_PKG_xml_light@
+OCAML_PKG_csv	    = @OCAML_PKG_csv@
+OCAML_PKG_calendar  = @OCAML_PKG_calendar@
+is_calendar2	    = @is_calendar2@
+OCAML_PKG_gettext   = @OCAML_PKG_gettext@
 
 OCAMLCPACKAGES	:= -package unix,extlib,curses,str,libvirt
 
-ifeq ($(pkg_gettext),yes)
+ifneq ($(OCAML_PKG_gettext),no)
 OCAMLCPACKAGES  += -package gettext-stub
 endif
 
@@ -43,22 +43,23 @@ OBJS		:= \
 		   virt_top_gettext.cmo \
 		   virt_top_utils.cmo \
 		   virt_top.cmo
-ifeq ($(pkg_xml_light),yes)
+ifneq ($(OCAML_PKG_xml_light),no)
 OBJS		+= virt_top_xml.cmo
 OCAMLCPACKAGES	+= -package xml-light
 endif
-ifeq ($(pkg_csv),yes)
+ifneq ($(OCAML_PKG_csv),no)
 OBJS		+= virt_top_csv.cmo
 OCAMLCPACKAGES	+= -package csv
 endif
-ifeq ($(pkg_calendar),yes)
+ifneq ($(OCAML_PKG_calendar),no)
+ifeq ($(is_calendar2),no)
 OBJS		+= virt_top_calendar1.cmo
 OCAMLCPACKAGES	+= -package calendar
-endif
-ifneq ($(pkg_calendar2),no)
+else
 OBJS		+= virt_top_calendar2.cmo
 OCAMLCPACKAGES	+= -package calendar
 endif
+endif
 OBJS		+= virt_top_main.cmo
 
 XOBJS		:= $(OBJS:.cmo=.cmx)