Update LYX_DIR_XXx and LYX_USERDIR_XXx environment variable names

in docs and manpages at install time.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26119 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/Makefile.am b/Makefile.am
index 81ee29e1f16ab2fe17f5a7a36a2b6bf2a77c3519..96783b16b39063392be64048a3a20bde4b8c2a67 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,8 @@ EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
 man_MANS = lyx.1
 
 lyx.1:
-       cp -p $(srcdir)/lyx.man lyx.1
+       sed -e "s/LYX_DIR_VER/$(LYX_DIR_VER)/g" \
+           -e "s/LYX_USERDIR_VER/$(LYX_USERDIR_VER)/g" $(srcdir)/lyx.man > lyx.1
 
 rpmdist: dist
        $(LN_S) $(srcdir)/lib/images/lyx.png . ; \

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index eb7e77144d23ccd56dfe9afc25c0952549c1ceac..46102850b6a2d8643bc992010a4a80e8ae95fb68 100644 (file)
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -1264,7 +1264,7 @@ status collapsed
 status collapsed
 
 \begin_layout Plain Layout
-LYX_USERDIR_16x
+LYX_USERDIR_VER
 \end_layout
 
 \end_inset

diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index 1ba8daf76bbef09377ae640f78ca680f7a63a76c..16ca7c5ac8d66c41c6d1c846f15a0e1bde45cc61 100644 (file)
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -253,6 +253,30 @@ dist_doc_DATA = \
 
 doc_DATA = $(docfiles) 
 
+doc_files = \
+           $(dist_doc_DATA) \
+           $(dist_cadoc_DATA) \
+           $(dist_csdoc_DATA) \
+           $(dist_dadoc_DATA) \
+           $(dist_dedoc_DATA) \
+           $(dist_esdoc_DATA) \
+           $(dist_eudoc_DATA) \
+           $(dist_frdoc_DATA) \
+           $(dist_gldoc_DATA) \
+           $(dist_hedoc_DATA) \
+           $(dist_hudoc_DATA) \
+           $(dist_itdoc_DATA) \
+           $(dist_jadoc_DATA) \
+           $(dist_nldoc_DATA) \
+           $(dist_nbdoc_DATA) \
+           $(dist_pldoc_DATA) \
+           $(dist_ptdoc_DATA) \
+           $(dist_rodoc_DATA) \
+           $(dist_rudoc_DATA) \
+           $(dist_skdoc_DATA) \
+           $(dist_sldoc_DATA) \
+           $(dist_svdoc_DATA)
+
 DEPENDFILE = $(srcdir)/Makefile.depend
 # include $(DEPENDFILE) does not work because automake is too limited.
 include $(srcdir)/Makefile.depend
@@ -284,6 +308,16 @@ install-data-hook: $(tocfiles)
                else file="$$i"; fi; \
                $(docDATA_INSTALL) "$$file" "$(DESTDIR)$(docdir)/$$i"; \
        done
+       for i in $(doc_files); \
+       do \
+               if $(EGREP) -q "LYX_DIR_VER|LYX_USERDIR_VER" "$(DESTDIR)$(docdir)/$$i"; then \
+                       sed -e "s/LYX_DIR_VER/$(LYX_DIR_VER)/g" \
+                           -e "s/LYX_USERDIR_VER/$(LYX_USERDIR_VER)/g" \
+                               "$(DESTDIR)$(docdir)/$$i" > "$(DESTDIR)$(docdir)/$$i.tmp"; \
+                       mv -f "$(DESTDIR)$(docdir)/$$i.tmp" "$(DESTDIR)$(docdir)/$$i"; \
+                       chmod 644 "$(DESTDIR)$(docdir)/$$i"; \
+               fi; \
+       done
 
 uninstall-local:
        for i in $(tocfiles); \

diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 01fd0bde3e35427cb55bbd6207a747fb7816a5e0..7afa9bc5822b47d484298b4b97bd7517a999a0f5 100644 (file)
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -1164,7 +1164,7 @@ Indem Sie LyX mit der Option
  Anstelle der Kommandozeilenoption können Sie übrigens auch die Umgebungsvariabl
 e 
 \family typewriter
-LYX_USERDIR_15x
+LYX_USERDIR_VER
 \family default
  auf das zu verwendende Verzeichnis setzen.
 \end_layout

diff --git a/lib/doc/eu/Customization.lyx b/lib/doc/eu/Customization.lyx
index e7bd90ef0513069ad605736d30aa2423158ef087..674ec6c6be73e115369dd6c6edb7f655f296a671 100644 (file)
--- a/lib/doc/eu/Customization.lyx
+++ b/lib/doc/eu/Customization.lyx
@@ -799,7 +799,7 @@ Erabdir
  dira).
  Ohartu zaitez 
 \family typewriter
-LYX_USERDIR_15x
+LYX_USERDIR_VER
 \family default
  inguruneko aldagaia balio hauetariko batekin ezartzeak antzeko eragina
  duela.

diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index 8a169d8eb1a7903b9f68584c67f30600b001b6bf..0de8510976a8e83a0a3bf360c9cfb95354dcf08f 100644 (file)
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -923,7 +923,7 @@ RépUtilisateur
  Ces répertoires sont complètement indépendants (mais lisez la suite).
  Notez que la variable d'environnement 
 \family typewriter
-LYX_USERDIR_15x
+LYX_USERDIR_VER
 \family default
  a exactement le même rôle.
 \end_layout

diff --git a/lib/doc/it/Customization.lyx b/lib/doc/it/Customization.lyx
index a051ca18779a9c7e560a7908401975ab2b8ae70c..624007cd7218b32bc9a2204b79dd2b5d60b8c4bc 100644 (file)
--- a/lib/doc/it/Customization.lyx
+++ b/lib/doc/it/Customization.lyx
@@ -879,7 +879,7 @@ Userdir
  Queste directory sono completamente indipendenti (ma continuate a leggere).
  Notare che settare la variabile ambientale 
 \family typewriter
-LYX_USERDIR_11x
+LYX_USERDIR_VER
 \family default
  allo stesso valore ha esattamente lo stesso effetto.
 \end_layout

diff --git a/lyx.man b/lyx.man
index 9506d01624ac3919501f8485b4e09348e38c63c9..2b6879e6ce1a55bf83770f5db00854fa4f0a6694 100644 (file)
--- a/lyx.man
+++ b/lyx.man
@@ -75,7 +75,7 @@ where fmt is the import format of choice and file.xxx is the file to be imported
 
 .SH ENVIRONMENT
 .TP
-.B LYX_DIR_16x
+.B LYX_DIR_VER
 can be used to specify which system directory to use.
 .PP
 The system directory is determined by searching for the file
@@ -83,7 +83,7 @@ The system directory is determined by searching for the file
 .br
 1) \-sysdir command line parameter
 .br
-2) LYX_DIR_16x environment variable
+2) LYX_DIR_VER environment variable
 .br
 3) Maybe <path of binary>/TOP_SRCDIR/lib
 .br
@@ -91,14 +91,14 @@ The system directory is determined by searching for the file
 .br
 5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX)
 .TP
-.B LYX_USERDIR_16x
+.B LYX_USERDIR_VER
 can be used to specify which user directory to use.
 .PP
 The user directory is, in order of precedence:
 .br
 1) \-userdir command line parameter
 .br
-2) LYX_USERDIR_16x environment variable
+2) LYX_USERDIR_VER environment variable
 .br
 3) $HOME/.<name of binary> if no explicit setting is made