Improvements in the installation process; still not perfect.

[lyx.git] / lib / reLyX / configure.in

diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index 8bc3ebd9ef85ab87eb095d614d919e047f69b5a9..293151a79004df1f4cc1b225d5b0855da8f4c996 100644 (file)
--- a/lib/reLyX/configure.in
+++ b/lib/reLyX/configure.in
@@ -1,8 +1,12 @@
-dnl Process this file with autoconf to produce a configure script.
+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)
@@ -11,18 +15,11 @@ dnl Checks for programs.
 AC_PROG_INSTALL
 RELYX_CHECK_PERL
 
-dnl Checks for libraries.
-dnl Replace `main' with a function in -lXpm:
-dnl AC_CHECK_LIB(Xpm, main)
-dnl Replace `main' with a function in -lforms:
-dnl AC_CHECK_LIB(forms, main)
+dnl Finish the work
+test $program_suffix = NONE && program_suffix=
+LYX_DIR=`eval "echo \`eval \"echo ${datadir}/lyx${program_suffix}\"\`"`
+AC_SUBST(LYX_DIR)
 
-dnl Checks for header files.
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-dnl Checks for library functions.
-
-AC_OUTPUT(Makefile reLyX, chmod 755 reLyX)
+AC_OUTPUT(Makefile reLyX noweb2lyx, chmod 755 reLyX noweb2lyx)
 
 RELYX_CHECK_ERRORS