--- a/ChangeLog
+++ b/ChangeLog
@@ -797,7 +797,7 @@
 	(--enable-strict-warning-flags): Rename from --enable-picky-flags.
 	(GXX_STRICT_FLAGS): Remove -Wenum-clash from the list.
 
-2009-03-08  Søren Hauberg  <hauberg@gmail.com>
+2009-03-08  S�ren Hauberg  <hauberg@gmail.com>
 
 	* NEWS: Mention 'histc'.
 
@@ -1567,7 +1567,7 @@
 	* aclocal.m4 (OCTAVE_PROG_GNUPLOT): Drop check for multiple plot
 	windows.
 
-2007-08-10  Søren Hauberg  <hauberg@gmail.com>
+2007-08-10  S�ren Hauberg  <hauberg@gmail.com>
 
 	* ROADMAP: Update for current sources.
 
@@ -1888,7 +1888,7 @@
 	* Makeconf.in (simple-move-if-change-rule,
 	(builddir-move-if-change-rule): New macros.
 
-2006-11-11  Søren Hauberg  <hauberg@gmail.com>
+2006-11-11  S�ren Hauberg  <hauberg@gmail.com>
 
 	* examples/Makefile.in (uninstall): Add missing semicolon.
 
@@ -2098,7 +2098,7 @@
 2006-09-27  John W. Eaton  <jwe@octave.org>
 
 	* mkoctfile.in [--mex]: Include -I. in incflags.
-	From Søren Hauberg <hauberg@gmail.com>.
+	From S�ren Hauberg <hauberg@gmail.com>.
 
 2006-09-26  John W. Eaton  <jwe@octave.org>
 
@@ -2480,7 +2480,7 @@
 	* configure.in: Use it.
 	* Makeconf.in: Substitute DESKTOP_FILE_INSTALL.
 
-	* octave.desktop.in: New file.  From Søren Hauberg <hauberg@gmail.com>.
+	* octave.desktop.in: New file.  From S�ren Hauberg <hauberg@gmail.com>.
 	* examples/Makefile.in (SOURCES): Add it to the list.
 	(octave.desktop): New target.
 	(all): Depend on octave.desktop.

--- a/Makefile.am
+++ b/Makefile.am
@@ -150,6 +150,8 @@
 	$(MAKE) -C doc ../$@
 .PHONY: BUGS INSTALL.OCTAVE
 
+octetc_DATA = NEWS
+
 DIRS_TO_MAKE = \
   $(localfcnfiledir) \
   $(localapifcnfiledir) \
@@ -164,20 +166,11 @@
 installdirs-local:
 	$(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE))
 
-install-data-local: installdirs-local install-extras
+install-data-local: installdirs-local
 
 install-exec-hook: make-version-links
 
-uninstall-local: remove-version-links uninstall-extras
-
-install-extras:
-	$(MKDIR_P) $(DESTDIR)$(octetcdir)
-	$(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(octetcdir)/NEWS
-.PHONY: install-extras
-
-uninstall-extras:
-	rm -f $(DESTDIR)$(octetcdir)/NEWS
-.PHONY: uninstall-extras
+uninstall-local: remove-version-links
 
 make-version-links:
 	cd $(DESTDIR)$(bindir) && \

--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-11  Rik  <octave@nomad.inbox5.com>
+
+	* interpreter/Makefile.am: remove install-local target and use automake 
+	syntax to install doc-cache file.
+
 2009-12-10  Rik <octave@nomad.inbox5.com>
 
 	* interpreter/Makefile.am: Replace distdir-local with dist-hook rule as it

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -24,8 +24,8 @@
 include ../common.mk
 
 EXTRA_DIST = \
+  ChangeLog \
   Makefile.am \
-  ChangeLog \
   texinfo.tex \
   texmf.cnf
 

--- a/doc/interpreter/Makefile.am
+++ b/doc/interpreter/Makefile.am
@@ -164,13 +164,7 @@
 	@$(GREP) '#define HAVE_UMFPACK 1' $(top_builddir)/config.h > /dev/null || { echo "Documentation creation requires missing UMFPACK library.  Cannot package distribution!" ; exit 1; }
 	@$(GREP) '#define HAVE_QHULL 1' $(top_builddir)/config.h > /dev/null || { echo "Documentation creation requires missing QHULL library.  Cannot package distribution!" ; exit 1; }
 
-# Install doc-cache of help files
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(octetcdir)
-	$(INSTALL_DATA) doc-cache $(DESTDIR)$(octetcdir)/doc-cache
-
-uninstall-local:
-	rm -f $(DESTDIR)$(octetcdir)/doc-cache
+octetc_DATA = doc-cache
 
 DOCSTRING_FILES = $(shell $(srcdir)/find-docstring-files.sh "$(top_srcdir)")
 

--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -25,6 +25,7 @@
 dist_archlib_SCRIPTS = info-emacs-info info-emacs-octave-help
 
 IMAGE_FILES = octave-sombrero.png
+image_DATA = $(IMAGE_FILES)
 
 EXTRA_DIST = \
   $(IMAGE_FILES) \
@@ -79,33 +80,14 @@
 	  -e "s|%OCTAVE_PREFIX%|${prefix}|"
 	mv $@-t $@
 
-install-data-local: install-images install-desktop
-
-uninstall-local: uninstall-images uninstall-desktop
-
-install-images:
-	$(MKDIR_P) $(DESTDIR)$(imagedir)
-	for f in $(IMAGE_FILES); do \
-	  rm -f $(DESTDIR)$(imagedir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \
-	done
-.PHONY: install-images
-
-install-desktop:
+install-data-local:
 	-if test -n "$(DESKTOP_FILE_INSTALL)"; then \
 	  $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
 	    --vendor www.octave.org octave.desktop; \
 	fi
-.PHONY: install-desktop
 
-uninstall-images:
-	for f in $(IMAGE_FILES); do \
-	  rm -f $(DESTDIR)$(imagedir)/$$f; \
-	done
-.PHONY: uninstall-images
-
-uninstall-desktop:
+uninstall-local:
 	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
 	  rm -f $(DESTDIR)$(datadir)/applications/www.octave.org-octave.desktop; \
 	fi
-.PHONY: uninstall-desktop
+

--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -361,26 +361,11 @@
 	fi
 .PHONY: check-m-sources
 
-install-data-local: install-images install-startup-files install-pkg-add
-
-uninstall-local: uninstall-images uninstall-startup-files uninstall-pkg-add
+install-data-local: install-startup-files install-pkg-add
 
-install-images:
-	$(MKDIR_P) $(DESTDIR)$(imagedir)
-	for im in $(IMAGES); do \
-	  f=`echo $$im | $(SED) 's,image/,,'`; \
-	  echo "$(INSTALL_DATA) $(srcdir)/$$im $(DESTDIR)$(imagedir)/$$f"; \
-	  $(INSTALL_DATA) $(srcdir)/$$im $(DESTDIR)$(imagedir)/$$f; \
-	done
-.PHONY: install-images
+uninstall-local: uninstall-startup-files uninstall-pkg-add
 
-uninstall-images:
-	for im in $(IMAGES); do \
-	  f=`echo $$im | $(SED) 's,.*/,,'`; \
-	  echo "rm -f $(DESTDIR)$(imagedir)/$$f"; \
-	  rm -f $(DESTDIR)$(imagedir)/$$f; \
-	done
-.PHONY: uninstall-images
+image_DATA = $(IMAGES)
 
 install-startup-files:
 	$(MKDIR_P) $(DESTDIR)$(fcnfiledir)/startup