? 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
? packaging/redhat/gnash.spec-pat
Index: doc/omf.make
===================================================================
RCS file: /sources/gnash/gnash/doc/omf.make,v
retrieving revision 1.8
diff -u -3 -p -r1.8 omf.make
--- doc/omf.make	7 Apr 2006 00:59:42 -0000	1.8
+++ doc/omf.make	22 Apr 2006 23:36:06 -0000
@@ -37,14 +37,14 @@ omf_timestamp: $(omffile)
 	done
 	touch omf_timestamp
 
-install-data-hook-omf:
+install-data-omf-hook:
 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
 	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)
 
-uninstall-local-omf:
+uninstall-omf-hook:
 	-for file in $(omffile); do \
 	    $(RM) $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
Index: doc/xmldocs.make
===================================================================
RCS file: /sources/gnash/gnash/doc/xmldocs.make,v
retrieving revision 1.6
diff -u -3 -p -r1.6 xmldocs.make
--- doc/xmldocs.make	21 Apr 2006 17:20:55 -0000	1.6
+++ doc/xmldocs.make	22 Apr 2006 23:36:06 -0000
@@ -95,13 +95,19 @@ uninstall-local:
 	-$(RM) -r $(DESTDIR)$(docdir)/images
 	-rmdir $(DESTDIR)$(docdir)
 
+INSTALL_DATA_HOOK = 
+UNINSTALL_HOOK =
+
 if GHELP
 all-local: omf
-install-data-hook: omf install-data-hook-omf
-uninstall-hook: uninstall-hook-omf
+INSTALL_DATA_HOOK += omf install-data-omf-hook
+UNINSTALL_HOOK += uninstall-omf-hook
 endif
 
 if ENABLE_TEXI
-install-data-hook: install-info-hook
-uninstall-hook: uninstall-info-hook
+INSTALL_DATA_HOOK += install-info-hook
+UNINSTALL_HOOK += uninstall-info-hook
 endif
+
+install-data-hook: $(INSTALL_DATA_HOOK)
+uninstall-hook: $(UNINSTALL_HOOK)
Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.23
diff -u -3 -p -r1.23 Makefile.am
--- doc/C/Makefile.am	22 Apr 2006 00:01:26 -0000	1.23
+++ doc/C/Makefile.am	22 Apr 2006 23:36:06 -0000
@@ -178,12 +178,14 @@ MAINTAINERCLEANFILES = \
 
 install-info-hook: gnash.info
 	test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs) "$(DESTDIR)$(infodir)"
-	$(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/gnash.info
-	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; \
-	else \
-	   install-info --entry="* Gnash: (gnash). GNU Flash Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 2>&1; \
+	$(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 \
+	    install-info --menuentry="Gnash" --description="GNU Flash Player" --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 2>&1; \
+	  else \
+	    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.20
diff -u -3 -p -r1.20 Makefile.am
--- plugin/Makefile.am	20 Apr 2006 17:21:40 -0000	1.20
+++ plugin/Makefile.am	22 Apr 2006 23:36:06 -0000
@@ -106,8 +106,9 @@ 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 \
 	 mozilla-sdk/include/npapi.h \
          mozilla-sdk/include/npupp.h \
Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.5
diff -u -3 -p -r1.5 gnash.spec
--- packaging/redhat/gnash.spec	22 Apr 2006 00:32:44 -0000	1.5
+++ packaging/redhat/gnash.spec	22 Apr 2006 23:36:06 -0000
@@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %post 
 /sbin/ldconfig
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-/sbin/install-info  --menuentry="Gnash" --description="GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player"  %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
@@ -111,7 +111,6 @@ scrollkeeper-update -q || :
 %{_libdir}/libgnash*.so.*
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
-%{_infodir}/dir
 %{_datadir}/gnash/
 %{_datadir}/omf/gnash/