Index: Makefile.am
===================================================================
RCS file: /cvs/mime/shared-mime-info/Makefile.am,v
retrieving revision 1.23
diff -p -u -B -r1.23 Makefile.am
--- Makefile.am	25 Aug 2006 14:25:59 -0000	1.23
+++ Makefile.am	11 Jan 2007 21:19:49 -0000
@@ -1,12 +1,8 @@
-## Process this file with automake to produce Makefile.in
-
 SUBDIRS=po
 
 INCLUDES = $(ALL_CFLAGS)
 
-AUTOMAKE_OPTIONS = foreign
-
-packagesdir = $(mimedir)/packages
+packagesdir = $(datadir)/mime/packages
 packages_DATA = freedesktop.org.xml
 
 bin_PROGRAMS = update-mime-database
@@ -45,16 +41,16 @@ $(pkgconfig_DATA): config.status
 
 install-data-hook: 
 if ENABLE_UPDATE_MIMEDB
-	$(DESTDIR)"$(bindir)/update-mime-database" "$(DESTDIR)${mimedir}"
+	$(DESTDIR)"$(bindir)/update-mime-database" "$(DESTDIR)$(datadir)/mime"
 endif
 
 uninstall-hook:
-	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)${mimedir}/$${media}/"*.xml; done
-	rm -f "$(DESTDIR)${mimedir}/globs"
-	rm -f "$(DESTDIR)${mimedir}/magic"
-	rm -f "$(DESTDIR)${mimedir}/aliases"
-	rm -f "$(DESTDIR)${mimedir}/subclasses"
-	rm -f "$(DESTDIR)${mimedir}/XMLnamespaces"
+	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)$(datadir)/mime/$${media}/"*.xml; done
+	rm -f "$(DESTDIR)$(datadir)/mime/globs"
+	rm -f "$(DESTDIR)$(datadir)/mime/magic"
+	rm -f "$(DESTDIR)$(datadir)/mime/aliases"
+	rm -f "$(DESTDIR)$(datadir)/mime/subclasses"
+	rm -f "$(DESTDIR)$(datadir)/mime/XMLnamespaces"
 
 all: check
 
Index: configure.in
===================================================================
RCS file: /cvs/mime/shared-mime-info/configure.in,v
retrieving revision 1.54
diff -p -u -B -r1.54 configure.in
--- configure.in	25 Aug 2006 16:17:56 -0000	1.54
+++ configure.in	11 Jan 2007 21:19:50 -0000
@@ -1,9 +1,8 @@
-dnl Process this file with autoconf to produce a configure script.
+AC_INIT([shared-mime-info],[0.19],[https://bugs.freedesktop.org/enter_bug.cgi?product=shared-mime-info])
 
-AC_INIT(freedesktop.org.xml.in)
-AM_INIT_AUTOMAKE(shared-mime-info, 0.19)
+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
 
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -42,11 +42,10 @@ AC_ARG_ENABLE(update-mimedb,
     enable_update_mimedb=yes)
  AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
 
-mimedir=['${datadir}/mime']
-AC_SUBST(mimedir)
-
-AC_OUTPUT(
+AC_CONFIG_FILES([
 Makefile
 shared-mime-info.pc
 po/Makefile.in
-)
+])
+
+AC_OUTPUT