Commit 3d06d77a authored by Jody Goldberg's avatar Jody Goldberg

Still more missing files

parent a148a4af
......@@ -3,6 +3,8 @@ SUBDIRS = intl po macros idl plugins wizards src graph doc icons
change_logs = \
OOChangeLog OChangeLog ChangeLog
bin_SCRIPTS = gnumeric-config
EXTRA_DIST = \
gnumeric.desktop.in README HACKING gnumeric.spec.in \
gnumeric.keys.in gnumeric.mime $(appicon_DATA) \
......@@ -34,3 +36,28 @@ dist-hook: gnumeric.spec
cp $(srcdir)/samples/*gnumeric $(distdir)/samples
cp gnumeric.spec $(distdir)
if BONOBO
gnumeric_version="$(VERSION)-bonobo"
else
gnumeric_version="$(VERSION)"
endif
gnumeric_datadir = $(datadir)/gnumeric/$(gnumeric_version)
gnumeric_libdir = $(libdir)/gnumeric/$(gnumeric_version)
## We create gnumeric-config 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).
gnumeric-config: gnumeric-config.in Makefile
## Use sed and then mv to avoid problems if the user interrupts.
sed -e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@BONOBO\@?$(BONOBO)?g' \
-e 's?\@prefix\@?$(prefix)?g' \
-e 's?\@exec_prefix\@?$(exec_prefix)?g' \
-e 's?\@datadir\@?$(gnumeric_datadir)?g' \
-e 's?\@libdir\@?$(gnumeric_libdir)?g' \
< $(srcdir)/gnumeric-config.in > gnumeric-config.tmp \
&& mv gnumeric-config.tmp gnumeric-config
......@@ -288,6 +288,21 @@ else
AC_MSG_ERROR(Did not find GTK+ installed)
fi
dnl ******************************
dnl Check for Applix SHELF
dnl ******************************
try_applix_shelf=false
applix_shelf=
applix_shelf_msg=no
have_applix_shelf=false
AC_ARG_WITH(applix_shelf,
[--{with,without}-shelf Compile with Applix SHELF support or without it],
if test x$withval = xyes; then
try_applix_shelf=true
fi
)
dnl ***************************************
EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo`
EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libglade $bonobo`
AC_SUBST(EXTRA_GNOME_LIBS)
......@@ -349,6 +364,7 @@ Configuration:
GB Support: ${gb_msg}
Bonobo Support: ${bonobo_msg}
Applix SHELF Support: ${applix_shelf_msg}
"
if $have_bonobo; then
echo "
......
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