Commit c4987575 authored by Jody Goldberg's avatar Jody Goldberg

Switch to a Makefile generated version of gnumericConf.sh

parent efb5d6ae
......@@ -20,6 +20,6 @@ xltmain.sh
gnumeric.keys
gnumeric.spec
gnumeric.desktop
gnumeric-config
gnumericConf.sh
ID
tags
......@@ -6,6 +6,8 @@
* configure.in : Tweak to produce a semi reasonable gnumericConf.sh
remove gnumeric-config.
* Makefile.am : ditto.
* gnumericConf.sh : ditto.
* src/sort.c (sort_range) : Use sheet_cell_remove_simple.
......
......@@ -6,6 +6,8 @@
* configure.in : Tweak to produce a semi reasonable gnumericConf.sh
remove gnumeric-config.
* Makefile.am : ditto.
* gnumericConf.sh : ditto.
* src/sort.c (sort_range) : Use sheet_cell_remove_simple.
......
......@@ -3,7 +3,30 @@ SUBDIRS = . intl po macros idl plugins wizards src graph doc icons
change_logs = \
OOChangeLog OChangeLog ChangeLog
bin_SCRIPTS = gnumeric-config
confexecdir=$(libdir)
confexec_DATA = gnumericConf.sh
CLEANFILES=gnumericConf.sh
## Cloned frmo gnome-print
##
## We create printConf.sh here and not from configure because we want
## to get the paths expanded correctly. Macros like srcdir are given
## the value NONE in configure if the user doesn't specify them (this
## is an autoconf feature, not a bug).
gnumericConf.sh: gnumericConf.sh.in Makefile
## Use sed and then mv to avoid problems if the user interrupts.
sed -e 's?\@gnumeric_prefix\@?$(prefix)?g' \
-e 's?\@gnumeric_exec_prefix\@?$(exec_prefix)?g' \
-e 's?\@gnumeric_version\@?$(gnumeric_version)?g' \
-e 's?\@gnumeric_datadir\@?$(gnumeric_datadir)?g' \
-e 's?\@gnumeric_libdir\@?$(gnumeric_libdir)?g' \
-e 's?\@gnumeric_plugindir\@?$(gnumeric_plugindir)?g' \
-e 's?\@gnumeric_gladedir\@?$(gnumeric_gladedir)?g' \
-e 's?\@gnumeric_bonobo_enabled\@?$(gnumeric_bonobo_enabled)?g' \
< $(srcdir)/gnumericConf.sh.in > gnumericConf.tmp \
&& mv gnumericConf.tmp gnumericConf.sh
EXTRA_DIST = \
gnumeric.desktop.in README HACKING gnumeric.spec.in \
......@@ -41,6 +64,4 @@ gnumeric_version="$(VERSION)-bonobo"
else
gnumeric_version="$(VERSION)"
endif
gnumeric_datadir = $(datadir)/gnumeric/$(gnumeric_version)
gnumeric_libdir = $(libdir)/gnumeric/$(gnumeric_version)
......@@ -6,6 +6,8 @@
* configure.in : Tweak to produce a semi reasonable gnumericConf.sh
remove gnumeric-config.
* Makefile.am : ditto.
* gnumericConf.sh : ditto.
* src/sort.c (sort_range) : Use sheet_cell_remove_simple.
......
......@@ -6,6 +6,8 @@
* configure.in : Tweak to produce a semi reasonable gnumericConf.sh
remove gnumeric-config.
* Makefile.am : ditto.
* gnumericConf.sh : ditto.
* src/sort.c (sort_range) : Use sheet_cell_remove_simple.
......
......@@ -6,6 +6,8 @@
* configure.in : Tweak to produce a semi reasonable gnumericConf.sh
remove gnumeric-config.
* Makefile.am : ditto.
* gnumericConf.sh : ditto.
* src/sort.c (sort_range) : Use sheet_cell_remove_simple.
......
......@@ -6,6 +6,8 @@
* configure.in : Tweak to produce a semi reasonable gnumericConf.sh
remove gnumeric-config.
* Makefile.am : ditto.
* gnumericConf.sh : ditto.
* src/sort.c (sort_range) : Use sheet_cell_remove_simple.
......
......@@ -6,6 +6,8 @@
* configure.in : Tweak to produce a semi reasonable gnumericConf.sh
remove gnumeric-config.
* Makefile.am : ditto.
* gnumericConf.sh : ditto.
* src/sort.c (sort_range) : Use sheet_cell_remove_simple.
......
......@@ -218,18 +218,11 @@ AM_CONDITIONAL(BONOBO, $have_bonobo)
dnl **************************************************
dnl * Config defaults (Must be after bonobo)
dnl **************************************************
dnl FIXME : This has several ugly bits.
dnl We should be using datadir rather than ${prefix}/share
dnl The same holds for libdir.
gnumeric_prefix="${prefix}"
gnumeric_exec_prefix="${exec_prefix}"
test "x${gnumeric_prefix}" = xNONE && gnumeric_prefix=${ac_default_prefix}
test "x${gnumeric_exec_prefix}" = xNONE && gnumeric_exec_prefix=${gnumeric_prefix}
gnumeric_version="${VERSION}${bonobo_suffix}"
gnumeric_datadir="${gnumeric_prefix}/share/gnumeric/${gnumeric_version}/"
gnumeric_libdir="${gnumeric_exec_prefix}/lib/gnumeric/${gnumeric_version}/"
gnumeric_datadir="${datadir}/gnumeric/${gnumeric_version}/"
gnumeric_libdir="${libdir}/gnumeric/${gnumeric_version}/"
gnumeric_plugindir="${gnumeric_libdir}plugins/"
gnumeric_gladedir="${gnumeric_datadir}glade/"
......@@ -241,9 +234,9 @@ AC_SUBST(gnumeric_exec_prefix)
AC_SUBST(gnumeric_datadir)
AC_SUBST(gnumeric_version)
AC_SUBST(gnumeric_libdir)
AC_SUBST(gnumeric_bonobo_enabled)
AC_SUBST(gnumeric_plugindir)
AC_SUBST(gnumeric_gladedir)
AC_SUBST(gnumeric_bonobo_enabled)
dnl ******************************
dnl Kludge for Libole2 virtual link.
......@@ -409,7 +402,6 @@ plugins/gda/Makefile
intl/Makefile
po/Makefile.in
macros/Makefile
gnumericConf.sh
gnumeric.desktop
stamp.h
],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
......
......@@ -3,7 +3,7 @@
#
GNUMERIC_PREFIX="@gnumeric_prefix@"
GNUMERIC_EXEC_PREFIX="@gnumeric_exec_prefix@"
GNUMERIC_VERISON="@gnumeric_version@"
GNUMERIC_VERSION="@gnumeric_version@"
GNUMERIC_DATADIR="@gnumeric_datadir@"
GNUMERIC_LIBDIR="@gnumeric_libdir@"
GNUMERIC_PLUGINDIR="@gnumeric_plugindir@"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment