[Xfce4-commits] r30370 - in terminal/trunk: . doc doc/C doc/C/images doc/da doc/da/images doc/fr doc/fr/images doc/ja doc/ja/images
Nick Schermer
nick at xfce.org
Tue Jul 21 18:43:33 CEST 2009
Author: nick
Date: 2009-07-21 16:43:33 +0000 (Tue, 21 Jul 2009)
New Revision: 30370
Modified:
terminal/trunk/Makefile.am
terminal/trunk/TerminalHelp.in
terminal/trunk/doc/C/Makefile.am
terminal/trunk/doc/C/images/Makefile.am
terminal/trunk/doc/Makefile.am
terminal/trunk/doc/da/Makefile.am
terminal/trunk/doc/da/images/Makefile.am
terminal/trunk/doc/fr/Makefile.am
terminal/trunk/doc/fr/images/Makefile.am
terminal/trunk/doc/ja/Makefile.am
terminal/trunk/doc/ja/images/Makefile.am
Log:
Install documentation in @docdir@, bug #5593.
Modified: terminal/trunk/Makefile.am
===================================================================
--- terminal/trunk/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -19,7 +19,7 @@
TerminalHelp: TerminalHelp.in Makefile
rm -f TerminalHelp.gen TerminalHelp
- sed -e "s,\@datadir\@,$(datadir),g" \
+ sed -e "s,\@docdir\@,$(docdir),g" \
< $(srcdir)/TerminalHelp.in \
> TerminalHelp.gen
mv TerminalHelp.gen TerminalHelp
Modified: terminal/trunk/TerminalHelp.in
===================================================================
--- terminal/trunk/TerminalHelp.in 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/TerminalHelp.in 2009-07-21 16:43:33 UTC (rev 30370)
@@ -19,7 +19,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-HELPDIR="@datadir@/doc/Terminal/"
+HELPDIR="@docdir@"
if test -n "$LC_ALL"; then
LC=$LC_ALL
Modified: terminal/trunk/doc/C/Makefile.am
===================================================================
--- terminal/trunk/doc/C/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/doc/C/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -1,7 +1,7 @@
-SUBDIRS = \
+SUBDIRS = \
images
-TARGET_DIR = $(datadir)/doc/Terminal/C
+TARGET_DIR = $(docdir)/C
STYLESHEET = ../terminal.xsl
DOCUMENT = Terminal.xml
@@ -35,15 +35,15 @@
(cd $(srcdir) && rm -rf html)
install-data-local:
- installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; then \
- echo "--- Nothing to install"; \
- else \
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
- for file in $$installfiles; do \
- echo "--- Installing "$$file; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(TARGET_DIR); \
- done; \
+ installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; then \
+ echo "--- Nothing to install"; \
+ else \
+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+ for file in $$installfiles; do \
+ echo "--- Installing "$$file; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(TARGET_DIR); \
+ done; \
fi
uninstall-local:
Modified: terminal/trunk/doc/C/images/Makefile.am
===================================================================
--- terminal/trunk/doc/C/images/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/doc/C/images/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -1,16 +1,16 @@
-imagesdir = $(datadir)/doc/Terminal/C/images
-images_DATA = \
- terminal-compose-shortcut.png \
- terminal-edit-preferences.png \
- terminal-first-time.png \
- terminal-multiple-tabs.png \
- terminal-preferences-advanced.png \
- terminal-preferences-appearance.png \
- terminal-preferences-colors.png \
- terminal-preferences-general.png \
- terminal-preferences-shortcuts.png \
- terminal-set-title.png \
+imagesdir = $(docdir)/C/images
+images_DATA = \
+ terminal-compose-shortcut.png \
+ terminal-edit-preferences.png \
+ terminal-first-time.png \
+ terminal-multiple-tabs.png \
+ terminal-preferences-advanced.png \
+ terminal-preferences-appearance.png \
+ terminal-preferences-colors.png \
+ terminal-preferences-general.png \
+ terminal-preferences-shortcuts.png \
+ terminal-set-title.png \
terminal-toolbars.png
-EXTRA_DIST = \
+EXTRA_DIST = \
$(images_DATA)
Modified: terminal/trunk/doc/Makefile.am
===================================================================
--- terminal/trunk/doc/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/doc/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -1,13 +1,13 @@
-SUBDIRS = \
- C \
- da \
- fr \
+SUBDIRS = \
+ C \
+ da \
+ fr \
ja
-cssdir = $(datadir)/doc/Terminal
-css_DATA = \
+cssdir = $(docdir)
+css_DATA = \
terminal.css
-EXTRA_DIST = \
- $(css_DATA) \
+EXTRA_DIST = \
+ $(css_DATA) \
terminal.xsl
Modified: terminal/trunk/doc/da/Makefile.am
===================================================================
--- terminal/trunk/doc/da/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/doc/da/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -1,7 +1,7 @@
-SUBDIRS = \
+SUBDIRS = \
images
-TARGET_DIR = $(datadir)/doc/Terminal/da
+TARGET_DIR = $(docdir)/da
STYLESHEET = ../terminal.xsl
DOCUMENT = Terminal.xml
@@ -35,15 +35,15 @@
(cd $(srcdir) && rm -rf html)
install-data-local:
- installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; then \
- echo "--- Nothing to install"; \
- else \
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
- for file in $$installfiles; do \
- echo "--- Installing "$$file; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(TARGET_DIR); \
- done; \
+ installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; then \
+ echo "--- Nothing to install"; \
+ else \
+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+ for file in $$installfiles; do \
+ echo "--- Installing "$$file; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(TARGET_DIR); \
+ done; \
fi
uninstall-local:
Modified: terminal/trunk/doc/da/images/Makefile.am
===================================================================
--- terminal/trunk/doc/da/images/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/doc/da/images/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -1,16 +1,16 @@
-imagesdir = $(datadir)/doc/Terminal/da/images
-images_DATA = \
- terminal-compose-shortcut.png \
- terminal-edit-preferences.png \
- terminal-first-time.png \
- terminal-multiple-tabs.png \
- terminal-preferences-advanced.png \
- terminal-preferences-appearance.png \
- terminal-preferences-colors.png \
- terminal-preferences-general.png \
- terminal-preferences-shortcuts.png \
- terminal-set-title.png \
+imagesdir = $(docdir)/da/images
+images_DATA = \
+ terminal-compose-shortcut.png \
+ terminal-edit-preferences.png \
+ terminal-first-time.png \
+ terminal-multiple-tabs.png \
+ terminal-preferences-advanced.png \
+ terminal-preferences-appearance.png \
+ terminal-preferences-colors.png \
+ terminal-preferences-general.png \
+ terminal-preferences-shortcuts.png \
+ terminal-set-title.png \
terminal-toolbars.png
-EXTRA_DIST = \
+EXTRA_DIST = \
$(images_DATA)
Modified: terminal/trunk/doc/fr/Makefile.am
===================================================================
--- terminal/trunk/doc/fr/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/doc/fr/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -1,7 +1,7 @@
-SUBDIRS = \
+SUBDIRS = \
images
-TARGET_DIR = $(datadir)/doc/Terminal/fr
+TARGET_DIR = $(docdir)/fr
STYLESHEET = ../terminal.xsl
DOCUMENT = Terminal.xml
@@ -35,15 +35,15 @@
(cd $(srcdir) && rm -rf html)
install-data-local:
- installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; then \
- echo "--- Nothing to install"; \
- else \
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
- for file in $$installfiles; do \
- echo "--- Installing "$$file; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(TARGET_DIR); \
- done; \
+ installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; then \
+ echo "--- Nothing to install"; \
+ else \
+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+ for file in $$installfiles; do \
+ echo "--- Installing "$$file; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(TARGET_DIR); \
+ done; \
fi
uninstall-local:
Modified: terminal/trunk/doc/fr/images/Makefile.am
===================================================================
--- terminal/trunk/doc/fr/images/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/doc/fr/images/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -1,16 +1,16 @@
-imagesdir = $(datadir)/doc/Terminal/fr/images
-images_DATA = \
- terminal-compose-shortcut.png \
- terminal-edit-preferences.png \
- terminal-first-time.png \
- terminal-multiple-tabs.png \
- terminal-preferences-advanced.png \
- terminal-preferences-appearance.png \
- terminal-preferences-colors.png \
- terminal-preferences-general.png \
- terminal-preferences-shortcuts.png \
- terminal-set-title.png \
+imagesdir = $(docdir)/fr/images
+images_DATA = \
+ terminal-compose-shortcut.png \
+ terminal-edit-preferences.png \
+ terminal-first-time.png \
+ terminal-multiple-tabs.png \
+ terminal-preferences-advanced.png \
+ terminal-preferences-appearance.png \
+ terminal-preferences-colors.png \
+ terminal-preferences-general.png \
+ terminal-preferences-shortcuts.png \
+ terminal-set-title.png \
terminal-toolbars.png
-EXTRA_DIST = \
+EXTRA_DIST = \
$(images_DATA)
Modified: terminal/trunk/doc/ja/Makefile.am
===================================================================
--- terminal/trunk/doc/ja/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/doc/ja/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -1,7 +1,7 @@
-SUBDIRS = \
+SUBDIRS = \
images
-TARGET_DIR = $(datadir)/doc/Terminal/ja
+TARGET_DIR = $(docdir)/ja
STYLESHEET = ../terminal.xsl
DOCUMENT = Terminal.xml
@@ -35,15 +35,15 @@
(cd $(srcdir) && rm -rf html)
install-data-local:
- installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; then \
- echo "--- Nothing to install"; \
- else \
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
- for file in $$installfiles; do \
- echo "--- Installing "$$file; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(TARGET_DIR); \
- done; \
+ installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; then \
+ echo "--- Nothing to install"; \
+ else \
+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+ for file in $$installfiles; do \
+ echo "--- Installing "$$file; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(TARGET_DIR); \
+ done; \
fi
uninstall-local:
Modified: terminal/trunk/doc/ja/images/Makefile.am
===================================================================
--- terminal/trunk/doc/ja/images/Makefile.am 2009-07-21 00:37:37 UTC (rev 30369)
+++ terminal/trunk/doc/ja/images/Makefile.am 2009-07-21 16:43:33 UTC (rev 30370)
@@ -1,16 +1,16 @@
-imagesdir = $(datadir)/doc/Terminal/ja/images
-images_DATA = \
- terminal-compose-shortcut.png \
- terminal-edit-preferences.png \
- terminal-first-time.png \
- terminal-multiple-tabs.png \
- terminal-preferences-advanced.png \
- terminal-preferences-appearance.png \
- terminal-preferences-colors.png \
- terminal-preferences-general.png \
- terminal-preferences-shortcuts.png \
- terminal-set-title.png \
+imagesdir = $(docdir)/ja/images
+images_DATA = \
+ terminal-compose-shortcut.png \
+ terminal-edit-preferences.png \
+ terminal-first-time.png \
+ terminal-multiple-tabs.png \
+ terminal-preferences-advanced.png \
+ terminal-preferences-appearance.png \
+ terminal-preferences-colors.png \
+ terminal-preferences-general.png \
+ terminal-preferences-shortcuts.png \
+ terminal-set-title.png \
terminal-toolbars.png
-EXTRA_DIST = \
+EXTRA_DIST = \
$(images_DATA)
More information about the Xfce4-commits
mailing list