? 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/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.25
diff -u -3 -p -r1.25 Makefile.am
--- doc/C/Makefile.am	24 Apr 2006 23:05:55 -0000	1.25
+++ doc/C/Makefile.am	29 Apr 2006 10:42:00 -0000
@@ -197,13 +197,13 @@ MAINTAINERCLEANFILES = \
 
 install-info-hook: gnash.info
 	test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs) "$(DESTDIR)$(infodir)"
-	$(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/gnash.info ; \
-	  if (/sbin/install-info --version) >/dev/null 2>&1; then \
+	$(INSTALL_DATA) $< $(DESTDIR)$(infodir)/gnash.info
+	@if (install-info --version) >/dev/null 2>&1; then \
 	  version=`install-info --version | grep -c 'GNU texinfo'`; \
 	  if test $$version -eq 0; then \
-	    /sbin/install-info --menuentry="Gnash" --description="GNU Flash Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 2>&1; \
+	    install-info --menuentry="Gnash" --description="GNU Flash Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 2>&1; \
 	  else \
-	    /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 2>&1; \
+	    install-info --entry="* Gnash: (gnash). GNU Flash Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 2>&1; \
 	  fi; \
 	fi
 
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.22
diff -u -3 -p -r1.22 Makefile.am
--- plugin/Makefile.am	24 Apr 2006 23:05:55 -0000	1.22
+++ plugin/Makefile.am	29 Apr 2006 10:42:00 -0000
@@ -105,7 +105,7 @@ AM_LDFLAGS  = $(X_LIBS) -lX11 -lXi -lXmu
 
 plugin_LTLIBRARIES = libgnashplugin.la
 
-noinst_HEADERS = plugin.h \
+noinst_HEADERS = plugin.h player.h \
 	 mozilla-sdk/pluginbase.h \
 	 mozilla-sdk/npplat.h \
          mozilla-sdk/include/jri.h \