Re: Network Monitor applet manual

[Mark McLoughlin <mark skynet ie>]

Hi Breda,

On Thu, 2004-02-12 at 20:59, Breda McColgan wrote:
> Hi Mark,
> 
> the approach you've suggested has the advantage that the writer would never need
> to update the images, because the correct images would automatically be copied
> from the software. However, it might be difficult for the writer to verify that
> the images are the latest? Would the actual images be checked out of CVS with the
> docs?

	I'm not sure exactly how you verify things, so I'll just explain what
I'm proposing:

  + There will be no "figures" dir in gnome-netstatus/help/C
  + When you do a "make install", instead of installing the images it 
    will install a symbolic link from $(docdir)/figures/$(icon) to
    $(prefix)/share/icons/gnome-netstatus/$(icon)
  + When you do a "make uninstall", these links will be removed.

	I've appended the patch below.

	So, what that means is the icons will only exist in the correct
location for installed docs. They won't exist in the correct location
for the docs in the CVS source directory. Is this a problem for you
guys?

> Also, please note that I had to update the images to remove the background color,
> so you should replace your versions with those in the help/C/figures directory
> before replacing the latter with symlinks.

	Hmm, strange. I don't see any background colour in yelp using links to
the original icons ...

Cheers,
Mark.

Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-netstatus/help/C/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- Makefile.am	11 Feb 2004 11:44:54 -0000	1.1
+++ Makefile.am	17 Feb 2004 10:00:15 -0000
@@ -1,7 +1,34 @@
-figdir = figures
 docname = gnome-netstatus
 lang = C
 omffile = gnome-netstatus-C.omf
 entities = legal.xml
+
+dest_figdir = figures
+src_figdir  = $(datadir)/icons/gnome-netstatus
+figures = 				\
+	gnome-netstatus-disconn.png     \
+	gnome-netstatus-idle.png        \
+	gnome-netstatus-rx.png          \
+	gnome-netstatus-tx.png          \
+	gnome-netstatus-txrx.png        \
+	gnome-netstatus-error.png
+
+install-data-local: install-icon-symlinks
+
+install-icon-symlinks:
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/$(dest_figdir); \
+	cd $(DESTDIR)$(docdir)/$(dest_figdir); \
+	for file in $(figures); do \
+	  rm -f $$file && $(LN_S) $(src_figdir)/$$file $$file; \
+	done
+
+uninstall-local: uninstall-icon-symlinks
+
+uninstall-icon-symlinks:
+	for file in $(figures); do \
+	  rm -f $(DESTDIR)$(docdir)/$(dest_figdir)/$$file; \
+	done; \
+	rmdir $(DESTDIR)$(docdir)/$(dest_figdir)
+
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook