anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improvements in the installation process; still not perfect.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@184 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 1999-10-12 14:08:52 +00:00
parent 12289a7271
commit 42c50382f1
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
1999-10-12 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 1999-10-12 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lib/reLyX/Makefile.am: install noweb2lyx.
* lib/Makefile.am: do not install LaTeXConfig.lyx.in; install
configure.
* lib/reLyX/configure.in: declare a config aux dir; set package
name to lyx (not sure what the best solution is); generate noweb2lyx.
* lib/layouts/egs.layout: fix the bibliography layout. * lib/layouts/egs.layout: fix the bibliography layout.
1999-10-08 Jürgen Vigna <jug@sad.it> 1999-10-08 Jürgen Vigna <jug@sad.it>

9
lib/Makefile.am
View File

@ -1,6 +1,7 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES = *.orig *.rej *~ *.bak textclass.lst packages.lst \ DISTCLEANFILES = *.orig *.rej *~ *.bak textclass.lst packages.lst \
lyxrc.defaults doc/LaTeXConfig.lyx lyxrc.defaults doc/LaTeXConfig.lyx
bin_SCRIPTS = configure
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = reLyX SUBDIRS = reLyX
@ -10,7 +11,7 @@ EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
CLIPART = clipart/*.eps CLIPART = clipart/*.eps
LAYOUT = layouts/*.layout layouts/*.inc LAYOUT = layouts/*.layout layouts/*.inc
DOC = doc/*.lyx doc/LaTeXConfig.lyx.in DOC = doc/*.lyx
KBD = kbd/*.kmap kbd/*.cdef KBD = kbd/*.kmap kbd/*.cdef
TEMPL = templates/*.lyx TEMPL = templates/*.lyx
BIND = bind/*.bind BIND = bind/*.bind
@ -18,9 +19,11 @@ EXAMPLES = examples/*.lyx
TEXSUPPORT = tex/*.cls TEXSUPPORT = tex/*.cls
IMAGES = images/README images/*.xpm images/*.xbm IMAGES = images/README images/*.xpm images/*.xbm
pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults textclass.lst packages.lst pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
textclass.lst packages.lst
LIBINSTFILES = $(LAYOUT) $(CLIPART) $(DOC) $(KBD) $(DOC) $(TEMPL) $(BIND) $(EXAMPLES) $(TEXSUPPORT) $(IMAGES) LIBINSTFILES = $(LAYOUT) $(CLIPART) $(DOC) $(KBD) $(DOC) $(TEMPL) $(BIND) \
$(EXAMPLES) $(TEXSUPPORT) $(IMAGES)
libinstalldirs: libinstalldirs:
for dir in $(LYXDATADIRS) ; do \ for dir in $(LYXDATADIRS) ; do \

2
lib/reLyX/Makefile.am
View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES= *.orig *.rej *~ *.bak reLyX reLyX.1 DISTCLEANFILES= *.orig *.rej *~ *.bak reLyX reLyX.1
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
bin_SCRIPTS = reLyX bin_SCRIPTS = reLyX noweb2lyx
LYXDATADIRS = reLyX reLyX/Text LYXDATADIRS = reLyX reLyX/Text
LYXDISTDIRS = Text LYXDISTDIRS = Text
man_MANS = reLyX.1 man_MANS = reLyX.1

7
lib/reLyX/configure.in
View File

@ -2,8 +2,11 @@ dnl Process with autoconf to generate configure script -*- sh -*-
AC_INIT(reLyX.in) AC_INIT(reLyX.in)
AC_PREREQ(2.13) dnl We want to use autoconf 2.13 AC_PREREQ(2.13) dnl We want to use autoconf 2.13
AC_PREFIX_PROGRAM(reLyX) AC_PREFIX_PROGRAM(reLyX)
AC_CONFIG_AUX_DIR(../../config)
PACKAGE=reLyX dnl PACKAGE=reLyX
dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
PACKAGE=lyx
VERSION=2.0 VERSION=2.0
dnl must make a macro that gets the reLyX version dnl must make a macro that gets the reLyX version
AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@ -17,6 +20,6 @@ test $program_suffix = NONE && program_suffix=
LYX_DIR=`eval "echo \`eval \"echo ${datadir}/lyx${program_suffix}\"\`"` LYX_DIR=`eval "echo \`eval \"echo ${datadir}/lyx${program_suffix}\"\`"`
AC_SUBST(LYX_DIR) AC_SUBST(LYX_DIR)
AC_OUTPUT(Makefile reLyX, chmod 755 reLyX) AC_OUTPUT(Makefile reLyX noweb2lyx, chmod 755 reLyX noweb2lyx)
RELYX_CHECK_ERRORS RELYX_CHECK_ERRORS