Improvements in the installation process; still not perfect.

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

diff --git a/ChangeLog b/ChangeLog
index 167f71b18c67b4ba6a877581d659138a25478b0f..c00a92032b7b983aa74e50130819486d7989c504 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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.
 
 1999-10-08  Jürgen Vigna <jug@sad.it>

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5ca1373d8c4f519845de7f2f3b3e6b128f6f019a..a96e01f58b42cade8b3e6b9021547e973afdab6f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = *.orig *.rej *~ *.bak textclass.lst packages.lst \
                lyxrc.defaults doc/LaTeXConfig.lyx
+bin_SCRIPTS = configure
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS    = reLyX
 
@@ -10,7 +11,7 @@ EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
 
 CLIPART = clipart/*.eps
 LAYOUT = layouts/*.layout layouts/*.inc 
-DOC = doc/*.lyx doc/LaTeXConfig.lyx.in
+DOC = doc/*.lyx 
 KBD = kbd/*.kmap kbd/*.cdef
 TEMPL = templates/*.lyx
 BIND = bind/*.bind
@@ -18,9 +19,11 @@ EXAMPLES = examples/*.lyx
 TEXSUPPORT = tex/*.cls
 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:
        for dir in $(LYXDATADIRS) ; do \

diff --git a/lib/reLyX/Makefile.am b/lib/reLyX/Makefile.am
index af58792cb9bddf2fa0c6d26b36c534c72ade0745..8acb7a599b320bed066163dead2b4e758dc7ee37 100644 (file)
--- a/lib/reLyX/Makefile.am
+++ b/lib/reLyX/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES= *.orig *.rej *~ *.bak reLyX reLyX.1
 MAINTAINERCLEANFILES = Makefile.in
-bin_SCRIPTS = reLyX
+bin_SCRIPTS = reLyX noweb2lyx
 LYXDATADIRS = reLyX reLyX/Text
 LYXDISTDIRS = Text
 man_MANS = reLyX.1

diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index f2bffd773fafda8946f064a9e59f3feb63df6a87..293151a79004df1f4cc1b225d5b0855da8f4c996 100644 (file)
--- a/lib/reLyX/configure.in
+++ b/lib/reLyX/configure.in
@@ -2,8 +2,11 @@ dnl Process with autoconf to generate configure script   -*- sh -*-
 AC_INIT(reLyX.in)
 AC_PREREQ(2.13) dnl We want to use autoconf 2.13
 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
 dnl must make a macro that gets the reLyX 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}\"\`"`
 AC_SUBST(LYX_DIR)
 
-AC_OUTPUT(Makefile reLyX, chmod 755 reLyX)
+AC_OUTPUT(Makefile reLyX noweb2lyx, chmod 755 reLyX noweb2lyx)
 
 RELYX_CHECK_ERRORS