dia r4083 - in trunk: . doc

[hans svn gnome org]

Author: hans
Date: Sun Jul  6 15:56:56 2008
New Revision: 4083
URL: http://svn.gnome.org/viewvc/dia?rev=4083&view=rev

Log:
2008-07-06  Hans Breuer  <hans breuer org>

	[Patch from Thomas Harding fixing help finally fixing bug #536334]
	* doc/Makefile.am hardcopies.make :
	- documentation uninstall was not complete
	- symlinks are done on $(helpdocdir)
	instead of $(DESTDIR)$(helpdocdir) to make packagers life easier
	(this results in dangling symlinks while $(DESTDIR) != "",
	then symlinks are correct while the package is installed from
	$(DESTDIR) to "/")



Modified:
   trunk/ChangeLog
   trunk/doc/Makefile.am
   trunk/hardcopies.make

Modified: trunk/doc/Makefile.am
==============================================================================
--- trunk/doc/Makefile.am	(original)
+++ trunk/doc/Makefile.am	Sun Jul  6 15:56:56 2008
@@ -14,7 +14,7 @@
 helpdir = $(pkgdatadir)/help
 endif
 
-sysdoc = $(datadir)/doc/$(docname)
+sysdoc = $(DESTDIR)$(docdir)
 
 
 
@@ -31,5 +31,7 @@
 
 uninstall-local:
 	rm -f $(DESTDIR)$(helpdir)/C
-	-rm -f $(sysdoc)/*
-
+	-rmdir $(DESTDIR)$(helpdir)
+	-rmdir $(sysdoc)/*
+	-rmdir $(sysdoc)
+	

Modified: trunk/hardcopies.make
==============================================================================
--- trunk/hardcopies.make	(original)
+++ trunk/hardcopies.make	Sun Jul  6 15:56:56 2008
@@ -159,7 +159,7 @@
 
 install-html-nognome:
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)/html/
-	-(cd $(DESTDIR)$(htmldir)/html/ && ln -s $(DESTDIR)$(helpdocdir) $(lang))
+	-(cd $(DESTDIR)$(htmldir)/html/ && ln -s $(helpdocdir) $(lang))
 
 uninstall-html-nognome:
 	-rm $(DESTDIR)$(htmldir)/html/$(lang)
@@ -209,3 +209,4 @@
 	for i in $^; do \
 	  rm -f $(sysdoc)/examples/$$(basename $$i) ;\
 	done
+	-rmdir $(sysdoc)/examples