NULL =
-idldir = $(top_srcdir)/util/idl
+idldir = $(datadir)
idl_DATA = idl/Magnifier.idl
serverinfodir = $(libdir)/bonobo/servers
serverinfo_DATA = Accessibility_Util.server
-@XML_I18N_MERGE_SERVER_RULE@
+@INTLTOOL_SERVER_RULE@
EXTRA_DIST = Accessibility_Util.server.in $(serverinfo_DATA) $(idl_DATA)