From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 12 Oct 1999 14:08:52 +0000 (+0000)
Subject: Improvements in the installation process; still not perfect.
X-Git-Tag: 1.6.10~22624
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=42c50382f1882e8a5e4b9b8a70816e35127cf3e9;p=lyx.git

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 167f71b18c..c00a92032b 100644
--- 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 5ca1373d8c..a96e01f58b 100644
--- 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 af58792cb9..8acb7a599b 100644
--- 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 f2bffd773f..293151a790 100644
--- 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