diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | help/Makefile.am | 9 | ||||
| -rw-r--r-- | help/nautilus-user-manual/C/Makefile.am | 32 | ||||
| -rw-r--r-- | help/nautilus-user-manual/C/nautilus-user-manual-C.omf | 6 | ||||
| -rw-r--r-- | help/nautilus-user-manual/Makefile.am | 1 | ||||
| -rw-r--r-- | help/omf.make | 53 | ||||
| -rw-r--r-- | help/xmldocs.make | 129 |
9 files changed, 149 insertions, 111 deletions
@@ -1,3 +1,19 @@ +2002-05-27 Chris Lyttle <chris@wilddev.net> + + * Makefile.am: remove omf-install dir + * configure.in: remove nautilus-quick-reference, + nautilus-release-notes, nautilus-screenshot-guidelines from + makefiles section. + * help/omf.make: Added new file for changed omf build system + * help/xmldocs.make: Updated for new omf build system + * help/Makefile.am: remove nautilus-quick-reference, + nautilus-release-notes, nautilus-screenshot-guidelines from subdirs + and htmldocs.make, sgmldocs.make from EXTRA_DIST + * help/nautilus-user-manual/C/Makefile.am: Change figs to figdir, add + legal.xml + * help/nautilus-user-manual/C/nautilus-user-manual-C.omf: Changed to + conform to new omf format + 2002-05-24 Anders Carlsson <andersca@gnu.org> * src/file-manager/fm-desktop-icon-view.c: (volume_ops_callback): diff --git a/Makefile.am b/Makefile.am index e9e271341..8daa6df90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ SUBDIRS = \ icons \ user-guide \ help \ - omf-install \ docs \ $(NULL) diff --git a/configure.in b/configure.in index e67032268..d3f4cd99d 100644 --- a/configure.in +++ b/configure.in @@ -337,18 +337,8 @@ data/emblems/Makefile data/patterns/Makefile docs/Makefile help/Makefile -help/nautilus-quick-reference/C/Makefile -help/nautilus-quick-reference/Makefile -help/nautilus-quick-reference/es/Makefile -help/nautilus-quick-reference/ko/Makefile -help/nautilus-quick-reference/no/Makefile -help/nautilus-quick-reference/sv/Makefile -help/nautilus-release-notes/C/Makefile -help/nautilus-release-notes/Makefile -help/nautilus-screenshot-guidelines/C/Makefile -help/nautilus-screenshot-guidelines/Makefile -help/nautilus-user-manual/C/Makefile help/nautilus-user-manual/Makefile +help/nautilus-user-manual/C/Makefile icons/Makefile icons/crux_eggplant/Makefile icons/crux_eggplant/backgrounds/Makefile @@ -372,7 +362,6 @@ libnautilus-private/Makefile libnautilus/Makefile libnautilus/libnautilus.pc nautilus.spec -omf-install/Makefile po/Makefile.in src/Makefile src/file-manager/Makefile diff --git a/help/Makefile.am b/help/Makefile.am index 1dc099322..8b58bb018 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,11 +1,6 @@ -SUBDIRS = \ - nautilus-user-manual \ - nautilus-quick-reference \ - nautilus-screenshot-guidelines \ - nautilus-release-notes +SUBDIRS = nautilus-user-manual EXTRA_DIST= \ - sgmldocs.make \ xmldocs.make \ - htmldocs.make + omf.make diff --git a/help/nautilus-user-manual/C/Makefile.am b/help/nautilus-user-manual/C/Makefile.am index 98ceec4b2..411f9d5c6 100644 --- a/help/nautilus-user-manual/C/Makefile.am +++ b/help/nautilus-user-manual/C/Makefile.am @@ -1,31 +1,7 @@ -figs = \ - figures/custom_icon_num.png \ - figures/preferences_menu_num.png \ - figures/home_folder_num.png \ - figures/sidebar_num.png \ - figures/nautilus_window_full_num.png \ - figures/news_num.png \ - figures/help_num.png \ - figures/locationbar_nqr.png \ - figures/full-1.png \ - figures/full-2.png \ - figures/full-3.png \ - figures/full-4.png \ - figures/full-5.png \ - figures/full-6.png \ - figures/link.png \ - figures/noread.png \ - figures/nowrite.png \ - figures/player-1.png \ - figures/player-2.png \ - figures/player-3.png \ - figures/player-4.png \ - figures/player.png \ - figures/viewmenu.png \ - figures/viewmusic.png -docname=nautilus-user-manual +figdir = figures +docname = nautilus-user-manual lang = C -omffile=nautilus-user-manual-C.omf -entities = +omffile = nautilus-user-manual-C.omf +entities = legal.xml include $(top_srcdir)/help/xmldocs.make dist-hook: app-dist-hook diff --git a/help/nautilus-user-manual/C/nautilus-user-manual-C.omf b/help/nautilus-user-manual/C/nautilus-user-manual-C.omf index 0e621fda8..a8b440159 100644 --- a/help/nautilus-user-manual/C/nautilus-user-manual-C.omf +++ b/help/nautilus-user-manual/C/nautilus-user-manual-C.omf @@ -16,11 +16,13 @@ <date> March 2002 </date> - <version id="2.0" date="March 2002" description="Updated for Nautilus 2.0"/> + <version identifier="2.0" date="March 2002" description="Updated for Nautilus 2.0"/> <subject category="GNOME|Core Desktop"/> + <description> + </description> <type>user's guide</type> <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/> - <identifier url="nautilus-user-manual.xml"/> + <identifier url="file://usr/share/gnome/help/nautilus-user-manual/C/nautilus-user-manual.xml"/> <language code="C"/> <relation seriesid="bef21208-6d94-11d6-90d5-c1c1b31158e5"/> <rights type="GNU FDL" license.version="1.1"/> diff --git a/help/nautilus-user-manual/Makefile.am b/help/nautilus-user-manual/Makefile.am index 1487d19f8..42ffacc26 100644 --- a/help/nautilus-user-manual/Makefile.am +++ b/help/nautilus-user-manual/Makefile.am @@ -1,2 +1 @@ SUBDIRS = C - diff --git a/help/omf.make b/help/omf.make new file mode 100644 index 000000000..3261e0015 --- /dev/null +++ b/help/omf.make @@ -0,0 +1,53 @@ +# +# No modifications of this Makefile should be necessary. +# +# This file contains the build instructions for installing OMF files. It is +# generally called from the makefiles for particular formats of documentation. +# +# Note that you must configure your package with --localstatedir=/var/lib +# so that the scrollkeeper-update command below will update the database +# in the standard scrollkeeper directory. +# +# If it is impossible to configure with --localstatedir=/var/lib, then +# modify the definition of scrollkeeper_localstate_dir so that +# it points to the correct location. Note that you must still use +# $(localstatedir) in this or when people build RPMs it will update +# the real database on their system instead of the one under RPM_BUILD_ROOT. +# +# Note: This make file is not incorporated into xmldocs.make because, in +# general, there will be other documents install besides XML documents +# and the makefiles for these formats should also include this file. +# +# About this file: +# This file was taken from scrollkeeper_example2, a package illustrating +# how to install documentation and OMF files for use with ScrollKeeper +# 0.3.x and 0.4.x. For more information, see: +# http://scrollkeeper.sourceforge.net/ +# Version: 0.1.2 (last updated: March 20, 2002) +# + +omf_dest_dir=$(datadir)/omf/@PACKAGE@ +scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper + +omf: omf_timestamp + +omf_timestamp: $(omffile) + -for file in $(omffile); do \ + scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \ + done + touch omf_timestamp + +install-data-hook-omf: + $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done + -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + +uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ + basefile=`basename $$file`; \ + rm -f $(omf_dest_dir)/$$basefile; \ + done + -rmdir $(omf_dest_dir) + -scrollkeeper-update -p $(scrollkeeper_localstate_dir) diff --git a/help/xmldocs.make b/help/xmldocs.make index 6a2ebb31e..0eb9585cc 100644 --- a/help/xmldocs.make +++ b/help/xmldocs.make @@ -1,86 +1,95 @@ +# +# No modifications of this Makefile should be necessary. +# # To use this template: -# 1) Define: figs, docname, lang, omffile, entities although figs, -# omffile, and entities may be empty in your Makefile.am which -# will "include" this one -# 2) Figures must go under figures/ and be in PNG format -# 3) You should only have one document per directory +# 1) Define: figdir, docname, lang, omffile, and entities in +# your Makefile.am file for each document directory, +# although figdir, omffile, and entities may be empty +# 2) Make sure the Makefile in (1) also includes +# "include $(top_srcdir)/xmldocs.make" and +# "dist-hook: app-dist-hook". +# 3) Optionally define 'entities' to hold xml entities which +# you would also like installed +# 4) Figures must go under $(figdir)/ and be in PNG format +# 5) You should only have one document per directory +# 6) Note that the figure directory, $(figdir)/, should not have its +# own Makefile since this Makefile installs those figures. # -# Note that this makefile forces the directory name under -# $prefix/share/gnome/help/ to be the same as the XML filename -# of the document. This is required by GNOME. eg: -# $prefix/share/gnome/help/fish_applet/C/fish_applet.xml -# ^^^^^^^^^^^ ^^^^^^^^^^^ -# Definitions: -# figs A list of screenshots which will be included in EXTRA_DIST -# Note that these should reside in figures/ and should be .png -# files, or you will have to make modifications below. -# docname This is the name of the XML file: <docname>.xml -# lang This is the document locale -# omffile This is the name of the OMF file. Convention is to name -# it <docname>-<locale>.omf. -# entities This is a list of XML entities which must be installed -# with the main XML file and included in EXTRA_DIST. -# eg: -# figs = \ -# figures/fig1.png \ -# figures/fig2.png +# example Makefile.am: +# figdir = figures # docname = scrollkeeper-manual # lang = C # omffile=scrollkeeper-manual-C.omf # entities = fdl.xml -# include $(top_srcdir)/help/xmldocs.make +# include $(top_srcdir)/xmldocs.make # dist-hook: app-dist-hook # +# About this file: +# This file was taken from scrollkeeper_example2, a package illustrating +# how to install documentation and OMF files for use with ScrollKeeper +# 0.3.x and 0.4.x. For more information, see: +# http://scrollkeeper.sourceforge.net/ +# Version: 0.1.2 (last updated: March 20, 2002) +# + +# ************* Begin of section some packagers may need to modify ************** +# This variable (docdir) specifies where the documents should be installed. +# This default value should work for most packages. +# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang) docdir = $(datadir)/gnome/help/$(docname)/$(lang) +# ************** You should not have to edit below this line ******************* xml_files = $(entities) $(docname).xml -omf_dir=$(top_srcdir)/omf-install - -EXTRA_DIST = $(xml_files) $(omffile) $(figs) - +EXTRA_DIST = $(xml_files) $(omffile) CLEANFILES = omf_timestamp -all: omf - -omf: omf_timestamp +include $(top_srcdir)/help/omf.make -omf_timestamp: $(omffile) - -for file in $(omffile); do \ - scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } /identifier/ {print $$0}' $${file} | awk 'BEGIN {FS="\""} /url/ {print $$2}'` $${file} $(omf_dir)/$${file}; \ - done - touch omf_timestamp +all: omf $(docname).xml: $(entities) - -ourdir=`pwd`; \ - cd $(srcdir); \ - cp $(entities) $$ourdir + -ourdir=`pwd`; \ + cd $(srcdir); \ + cp $(entities) $$ourdir -app-dist-hook: - -$(mkinstalldirs) $(distdir)/figures - -if [ -e topic.dat ]; then \ - cp $(srcdir)/topic.dat $(distdir); \ - fi +app-dist-hook: + if test "$(figdir)"; then \ + $(mkinstalldirs) $(distdir)/$(figdir); \ + for file in $(srcdir)/$(figdir)/*.png; do \ + basefile=`echo $$file | sed -e 's,^.*/,,'`; \ + $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \ + done \ + fi -install-data-am: omf - -$(mkinstalldirs) $(DESTDIR)$(docdir)/figures - -cp $(srcdir)/$(xml_files) $(DESTDIR)$(docdir) - -for file in $(srcdir)/figures/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/figures/$$basefile; \ +install-data-local: omf + $(mkinstalldirs) $(DESTDIR)$(docdir) + for file in $(xml_files); do \ + cp $(srcdir)/$$file $(DESTDIR)$(docdir); \ done - -if [ -e $(srcdir)/topic.dat ]; then \ - $(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(docdir); \ - fi + if test "$(figdir)"; then \ + $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \ + for file in $(srcdir)/$(figdir)/*.png; do \ + basefile=`echo $$file | sed -e 's,^.*/,,'`; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ + done \ + fi -uninstall-local: - -for file in $(srcdir)/figures/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - rm -f $(docdir)/figures/$$basefile; \ - done +install-data-hook: install-data-hook-omf + +uninstall-local: uninstall-local-doc uninstall-local-omf + +uninstall-local-doc: + -if test "$(figdir)"; then \ + for file in $(srcdir)/$(figdir)/*.png; do \ + basefile=`echo $$file | sed -e 's,^.*/,,'`; \ + rm -f $(docdir)/$(figdir)/$$basefile; \ + done; \ + rmdir $(DESTDIR)$(docdir)/$(figdir); \ + fi -for file in $(xml_files); do \ rm -f $(DESTDIR)$(docdir)/$$file; \ done - -rmdir $(DESTDIR)$(docdir)/figures -rmdir $(DESTDIR)$(docdir) + |