mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
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
This commit is contained in:
parent
9e5b5746e4
commit
e5e65c031c
@ -28,7 +28,8 @@ EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
|
|||||||
man_MANS = lyx.1
|
man_MANS = lyx.1
|
||||||
|
|
||||||
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
|
rpmdist: dist
|
||||||
$(LN_S) $(srcdir)/lib/images/lyx.png . ; \
|
$(LN_S) $(srcdir)/lib/images/lyx.png . ; \
|
||||||
|
@ -1264,7 +1264,7 @@ status collapsed
|
|||||||
status collapsed
|
status collapsed
|
||||||
|
|
||||||
\begin_layout Plain Layout
|
\begin_layout Plain Layout
|
||||||
LYX_USERDIR_16x
|
LYX_USERDIR_VER
|
||||||
\end_layout
|
\end_layout
|
||||||
|
|
||||||
\end_inset
|
\end_inset
|
||||||
|
@ -253,6 +253,30 @@ dist_doc_DATA = \
|
|||||||
|
|
||||||
doc_DATA = $(docfiles)
|
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
|
DEPENDFILE = $(srcdir)/Makefile.depend
|
||||||
# include $(DEPENDFILE) does not work because automake is too limited.
|
# include $(DEPENDFILE) does not work because automake is too limited.
|
||||||
include $(srcdir)/Makefile.depend
|
include $(srcdir)/Makefile.depend
|
||||||
@ -284,6 +308,16 @@ install-data-hook: $(tocfiles)
|
|||||||
else file="$$i"; fi; \
|
else file="$$i"; fi; \
|
||||||
$(docDATA_INSTALL) "$$file" "$(DESTDIR)$(docdir)/$$i"; \
|
$(docDATA_INSTALL) "$$file" "$(DESTDIR)$(docdir)/$$i"; \
|
||||||
done
|
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:
|
uninstall-local:
|
||||||
for i in $(tocfiles); \
|
for i in $(tocfiles); \
|
||||||
|
@ -1164,7 +1164,7 @@ Indem Sie LyX mit der Option
|
|||||||
Anstelle der Kommandozeilenoption können Sie übrigens auch die Umgebungsvariabl
|
Anstelle der Kommandozeilenoption können Sie übrigens auch die Umgebungsvariabl
|
||||||
e
|
e
|
||||||
\family typewriter
|
\family typewriter
|
||||||
LYX_USERDIR_15x
|
LYX_USERDIR_VER
|
||||||
\family default
|
\family default
|
||||||
auf das zu verwendende Verzeichnis setzen.
|
auf das zu verwendende Verzeichnis setzen.
|
||||||
\end_layout
|
\end_layout
|
||||||
|
@ -799,7 +799,7 @@ Erabdir
|
|||||||
dira).
|
dira).
|
||||||
Ohartu zaitez
|
Ohartu zaitez
|
||||||
\family typewriter
|
\family typewriter
|
||||||
LYX_USERDIR_15x
|
LYX_USERDIR_VER
|
||||||
\family default
|
\family default
|
||||||
inguruneko aldagaia balio hauetariko batekin ezartzeak antzeko eragina
|
inguruneko aldagaia balio hauetariko batekin ezartzeak antzeko eragina
|
||||||
duela.
|
duela.
|
||||||
|
@ -923,7 +923,7 @@ RépUtilisateur
|
|||||||
Ces répertoires sont complètement indépendants (mais lisez la suite).
|
Ces répertoires sont complètement indépendants (mais lisez la suite).
|
||||||
Notez que la variable d'environnement
|
Notez que la variable d'environnement
|
||||||
\family typewriter
|
\family typewriter
|
||||||
LYX_USERDIR_15x
|
LYX_USERDIR_VER
|
||||||
\family default
|
\family default
|
||||||
a exactement le même rôle.
|
a exactement le même rôle.
|
||||||
\end_layout
|
\end_layout
|
||||||
|
@ -879,7 +879,7 @@ Userdir
|
|||||||
Queste directory sono completamente indipendenti (ma continuate a leggere).
|
Queste directory sono completamente indipendenti (ma continuate a leggere).
|
||||||
Notare che settare la variabile ambientale
|
Notare che settare la variabile ambientale
|
||||||
\family typewriter
|
\family typewriter
|
||||||
LYX_USERDIR_11x
|
LYX_USERDIR_VER
|
||||||
\family default
|
\family default
|
||||||
allo stesso valore ha esattamente lo stesso effetto.
|
allo stesso valore ha esattamente lo stesso effetto.
|
||||||
\end_layout
|
\end_layout
|
||||||
|
8
lyx.man
8
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
|
.SH ENVIRONMENT
|
||||||
.TP
|
.TP
|
||||||
.B LYX_DIR_16x
|
.B LYX_DIR_VER
|
||||||
can be used to specify which system directory to use.
|
can be used to specify which system directory to use.
|
||||||
.PP
|
.PP
|
||||||
The system directory is determined by searching for the file
|
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
|
.br
|
||||||
1) \-sysdir command line parameter
|
1) \-sysdir command line parameter
|
||||||
.br
|
.br
|
||||||
2) LYX_DIR_16x environment variable
|
2) LYX_DIR_VER environment variable
|
||||||
.br
|
.br
|
||||||
3) Maybe <path of binary>/TOP_SRCDIR/lib
|
3) Maybe <path of binary>/TOP_SRCDIR/lib
|
||||||
.br
|
.br
|
||||||
@ -91,14 +91,14 @@ The system directory is determined by searching for the file
|
|||||||
.br
|
.br
|
||||||
5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX)
|
5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX)
|
||||||
.TP
|
.TP
|
||||||
.B LYX_USERDIR_16x
|
.B LYX_USERDIR_VER
|
||||||
can be used to specify which user directory to use.
|
can be used to specify which user directory to use.
|
||||||
.PP
|
.PP
|
||||||
The user directory is, in order of precedence:
|
The user directory is, in order of precedence:
|
||||||
.br
|
.br
|
||||||
1) \-userdir command line parameter
|
1) \-userdir command line parameter
|
||||||
.br
|
.br
|
||||||
2) LYX_USERDIR_16x environment variable
|
2) LYX_USERDIR_VER environment variable
|
||||||
.br
|
.br
|
||||||
3) $HOME/.<name of binary> if no explicit setting is made
|
3) $HOME/.<name of binary> if no explicit setting is made
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user