? doc/omf.make-new ? doc/omf.make-warn_root ? doc/xmldocs.make-new ? doc/C/Makefile.am-conflict ? doc/C/Makefile.am-new ? doc/C/gnash.1 ? doc/C/gnash.info ? doc/C/gnash.texi ? doc/C/gnash.txml Index: doc/omf.make =================================================================== RCS file: /sources/gnash/gnash/doc/omf.make,v retrieving revision 1.9 diff -u -3 -p -r1.9 omf.make --- doc/omf.make 23 Apr 2006 02:51:44 -0000 1.9 +++ doc/omf.make 17 May 2006 21:20:50 -0000 @@ -42,11 +42,11 @@ install-data-omf-hook: for file in $(omffile); do \ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ done - $(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + -$(SCROLLUPDATE) -v -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) uninstall-omf-hook: -for file in $(omffile); do \ $(RM) $(DESTDIR)$(omf_dest_dir)/$$file; \ done -rmdir $(DESTDIR)$(omf_dest_dir) - $(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir) + -$(SCROLLUPDATE) -v -p $(scrollkeeper_localstate_dir) Index: doc/C/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v retrieving revision 1.26 diff -u -3 -p -r1.26 Makefile.am --- doc/C/Makefile.am 3 May 2006 07:38:24 -0000 1.26 +++ doc/C/Makefile.am 17 May 2006 21:20:50 -0000 @@ -198,7 +198,7 @@ MAINTAINERCLEANFILES = \ install-info-hook: gnash.info test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs) "$(DESTDIR)$(infodir)" $(INSTALL_DATA) $< $(DESTDIR)$(infodir)/gnash.info - if (install-info --version) >/dev/null 2>&1; then \ + -if (install-info --version) >/dev/null 2>&1; then \ version=`install-info --version | grep -c 'GNU texinfo'`; \ if test $$version -eq 0; then \ install-info --menuentry="Gnash" --description="GNU Flash Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 2>&1; \