[Xfce4-commits] <terminal:master> Install docs in correct location when renaming package.

[Nick Schermer]

Updating branch refs/heads/master
         to 5918d4d31de053511f6e83c2864dac91a9ed5451 (commit)
       from 42f02847ac99087e5a563559d5bc8d6eed196cb9 (commit)

commit 5918d4d31de053511f6e83c2864dac91a9ed5451
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Feb 1 21:29:22 2010 +0100

    Install docs in correct location when renaming package.

 doc/Makefile.am             |    8 +++++---
 terminal/terminal-dialogs.c |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b0ba12d..131d41a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,14 +18,14 @@ install-data-local:
 			installfiles=`echo $(srcdir)/html/$$lang/*`; \
 			for file in $$installfiles; do \
 				echo "--- Installing "$$file; \
-				$(INSTALL_DATA) $$file $$dest; \
+				$(INSTALL_DATA) $$file $$dest/; \
 			done; \
 			if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
 				echo "--- Creating symlink to C images for $$lang"; \
-				ln -sf $(docdir)/C/images $(DESTDIR)$(docdir)/$$lang/images; \
+				ln -sf $(docdir)/C/images $$dest/images; \
 			fi \
 		fi; \
-		file=$(srcdir)/man/$$lang/$(PACKAGE).1; \
+		file=$(srcdir)/man/$$lang/*.1; \
 		if test -f $$file ; then \
 			if test x"$$lang" = x"C"; then \
 				dest=$(DESTDIR)$(mandir)/man1; \
@@ -53,6 +53,7 @@ uninstall-local:
 		else \
 			dest=$(DESTDIR)$(mandir)/$$lang/man1/$(PACKAGE).1; \
 		fi; \
+		dest=`echo $$dest | sed '$(program_transform_name)'`; \
 		if test -f $$dest; then \
 			rm -f $$dest; \
 		fi \
@@ -99,6 +100,7 @@ doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(HTML_STY
 		fi; \
 		sed -e "s,\@PACKAGE_NAME\@,$(PACKAGE_NAME),g" \
 			-e "s,\@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g" \
+			-e '$(program_transform_name)' \
 			-i xgen-doc xgen-man; \
 		echo "Validating DocBook XML files"; \
 		$(XMLLINT) --noout --valid xgen-doc xgen-man; \
diff --git a/terminal/terminal-dialogs.c b/terminal/terminal-dialogs.c
index 62afca1..ca3807c 100644
--- a/terminal/terminal-dialogs.c
+++ b/terminal/terminal-dialogs.c
@@ -226,7 +226,7 @@ terminal_dialogs_show_help (gpointer     parent,
     screen = gtk_widget_get_screen (GTK_WIDGET (parent));
 
   /* generate the command for the documentation browser */
-  command = g_strdup (LIBEXECDIR "/TerminalHelp");
+  command = g_strdup (LIBEXECDIR G_DIR_SEPARATOR_S TERMINAL_NAME "Help");
 
   /* check if a page is given */
   if (G_UNLIKELY (page != NULL))