Menu update from Rob

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

diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index b90fb676ff5dcd1394e24cf94c2506cc487104c9..f59fec50ad7406efa9f8442907628ccaae9791a5 100644 (file)
--- a/lib/reLyX/configure.in
+++ b/lib/reLyX/configure.in
@@ -3,27 +3,40 @@ AC_INIT(reLyX.in)
 AC_PREREQ(2.13) dnl We want to use autoconf 2.13
 AC_CONFIG_AUX_DIR(../../config)
 
+dnl PACKAGE=reLyX
+dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
+
+AC_ARG_WITH(lyxname,
+  [  --with-lyxname          the name under which lyx will be installed],
+  [lyxname=$withval],[lyxname=lyx])
+
+dnl must make a macro that gets the reLyX version
+VERSION=2.0
+AM_INIT_AUTOMAKE($lyxname, $VERSION)
+
+# if reLyX has already been generated in this directory, delete it first
+test -x reLyX && rm -f reLyX
+# Find an already installed reLyX
 AC_PREFIX_PROGRAM(reLyX)
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-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)
+# we need to expand ${datadir} to put it into the reLyX wrapper.
+LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+AC_SUBST(LYX_DIR)
+
+# Work around a problem in automake 1.4: when invoking install-strip,
+# INSTALL_PROGRAM is changed to 'install -s', and since
+# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
+# which returns an error condition when stripping fails.
+INSTALL_SCRIPT='${INSTALL}'
 
 dnl Checks for programs.
 AC_PROG_INSTALL
 RELYX_CHECK_PERL
 
 dnl Finish the work
-test $program_suffix = NONE && program_suffix=
-LYX_DIR=`eval "echo \`eval \"echo ${datadir}/lyx${program_suffix}\"\`"`
-AC_SUBST(LYX_DIR)
-
 AC_OUTPUT(Makefile reLyX noweb2lyx, chmod 755 reLyX noweb2lyx)
 
 RELYX_CHECK_ERRORS