Commit 1acad33b authored by Stepan Kasal's avatar Stepan Kasal

Change the way gnumeric-paths.h is generated.

parent 2b2caeca
2005-04-21 Stepan Kasal <kasal@ucw.cz>
* src/Makefile.am (gnumeric-paths.h): Rewrite the rule,
gnumeric-paths.sh* is no longer used.
* src/gnumeric-paths.sh.in: Removed.
* src/.cvsignore: Remove src/gnumeric-paths.sh.
* configure.in: Don't generate gnumeric-paths.sh, rearrange the
gnumeric_* AC_SUBSTs.
(gnumeric_gladedir, gnumeric_autoformatdir): Nuke.
* src/dialogs/Makefile.am (gnumeric_gladedir): Replace by value.
* templates/autoformat/Makefile.am (autoformatdir): New variable.
(EXTRA_DIST): Don't use "%" when replacing suffixes; it's GNU make
specific.
2005-04-20 Stepan Kasal <kasal@ucw.cz>
gnm_sys_lib_dir() and such now just return the string;
......@@ -25,7 +39,6 @@
* src/sheet-object-image.c: Include goffice/utils/go-glib-extras.h
2005-04-20 Ivan, Wong Yat Cheung <email@ivanwong.info>
* src/wbc-gtk.c (wbc_gtk_init_font_name): Set
......
2005-04-21 Stepan Kasal <kasal@ucw.cz>
* src/Makefile.am (gnumeric-paths.h): Rewrite the rule,
gnumeric-paths.sh* is no longer used.
* src/gnumeric-paths.sh.in: Removed.
* src/.cvsignore: Remove src/gnumeric-paths.sh.
* configure.in: Don't generate gnumeric-paths.sh, rearrange the
gnumeric_* AC_SUBSTs.
(gnumeric_gladedir, gnumeric_autoformatdir): Nuke.
* src/dialogs/Makefile.am (gnumeric_gladedir): Replace by value.
* templates/autoformat/Makefile.am (autoformatdir): New variable.
(EXTRA_DIST): Don't use "%" when replacing suffixes; it's GNU make
specific.
2005-04-20 Stepan Kasal <kasal@ucw.cz>
gnm_sys_lib_dir() and such now just return the string;
......@@ -25,7 +39,6 @@
* src/sheet-object-image.c: Include goffice/utils/go-glib-extras.h
2005-04-20 Ivan, Wong Yat Cheung <email@ivanwong.info>
* src/wbc-gtk.c (wbc_gtk_init_font_name): Set
......
......@@ -881,48 +881,26 @@ AC_SUBST(MONO_LIBS)
dnl **************************************************
dnl * Config defaults (Must be after bonobo)
dnl **************************************************
gnumeric_version="${VERSION}"
gnumeric_prefix='${prefix}'
gnumeric_exec_prefix='${exec_prefix}'
gnumeric_sysconfdir='${sysconfdir}'
dnl These are changed in libgnumeric.c for WIN32 packages
gnumeric_datadir='${datadir}/gnumeric/${gnumeric_version}'
gnumeric_libdir='${libdir}/gnumeric/${gnumeric_version}'
gnumeric_plugindir='${gnumeric_libdir}/plugins'
gnumeric_gladedir='${gnumeric_datadir}/glade'
gnumeric_icondir='${datadir}/pixmaps/gnumeric'
gnumeric_localedir='${prefix}/${DATADIRNAME}/locale'
gnumeric_autoformatdir='${gnumeric_datadir}/autoformat-templates'
dnl
dnl These are changed in gutils.c for WIN32 packages
AC_SUBST(gnumeric_datadir, '${datadir}/gnumeric/${VERSION}')
AC_SUBST(gnumeric_libdir, '${libdir}/gnumeric/${VERSION}')
AC_SUBST(gnumeric_icondir, '${datadir}/pixmaps/gnumeric')
AC_SUBST(gnumeric_localedir, '${prefix}/${DATADIRNAME}/locale')
dnl
AC_SUBST(gnumeric_plugindir, '${gnumeric_libdir}/plugins')
dnl Export to gnumeric-config.h
AC_DEFINE_UNQUOTED(GNUMERIC_VERSION, "gnumeric_full_version",
[The version number of this release, possibly suffixed for bonobo]
)
AC_DEFINE_UNQUOTED(GNM_VERSION_EPOCH, gnumeric_version_epoch,
[The Epoch of this release]
)
AC_DEFINE_UNQUOTED(GNM_VERSION_MAJOR, gnumeric_version_major,
[The Major version number of this release]
)
AC_DEFINE_UNQUOTED(GNM_VERSION_MINOR, gnumeric_version_minor,
[The Minor version number of this release]
)
AC_DEFINE_UNQUOTED(GNM_VERSION_EXTRA, "gnumeric_version_extra",
[Extra, possibly empty tag for this release]
)
AC_SUBST(gnumeric_version)
AC_SUBST(gnumeric_prefix)
AC_SUBST(gnumeric_exec_prefix)
AC_SUBST(gnumeric_sysconfdir)
AC_SUBST(gnumeric_datadir)
AC_SUBST(gnumeric_libdir)
AC_SUBST(gnumeric_plugindir)
AC_SUBST(gnumeric_gladedir)
AC_SUBST(gnumeric_icondir)
AC_SUBST(gnumeric_localedir)
AC_SUBST(gnumeric_autoformatdir)
AC_SUBST(gnumeric_with_gnome)
AC_DEFINE(GNUMERIC_VERSION, "gnumeric_full_version",
[The version number of this release, possibly suffixed for bonobo])
AC_DEFINE(GNM_VERSION_EPOCH, gnumeric_version_epoch,
[The Epoch of this release])
AC_DEFINE(GNM_VERSION_MAJOR, gnumeric_version_major,
[The Major version number of this release])
AC_DEFINE(GNM_VERSION_MINOR, gnumeric_version_minor,
[The Minor version number of this release])
AC_DEFINE(GNM_VERSION_EXTRA, "gnumeric_version_extra",
[Extra, possibly empty tag for this release])
AC_OUTPUT([
gnumeric.spec
......@@ -930,7 +908,6 @@ Makefile
icons/Makefile
src/Makefile
src/dialogs/Makefile
src/gnumeric-paths.sh
src/pixmaps/Makefile
src/widgets/Makefile
src/tools/Makefile
......
......@@ -8,7 +8,6 @@ parser.c
gnm-marshalers.c
gnm-marshalers.h
gnumeric-paths.h
gnumeric-paths.sh
ssconvert
ssindex
test-pango
......
......@@ -345,13 +345,24 @@ GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=gnm_
echo '#include "$*.h"' && \
$(GENMARSHAL_COMMAND) --body $< ) >$@
gnumeric-paths.h: gnumeric-paths.sh
@sh $< > $@.tmp ; \
if cmp -s $@.tmp $@; then \
rm $@.tmp; \
else \
mv $@.tmp $@ ; echo updated gnumeric-paths.h ; \
fi
# Depends on this Makefile, because it uses make variables.
gnumeric-paths.h: Makefile
@echo 'creating $@'
@( \
echo '/* This file has been automatically generated. Do not edit. */'; \
echo ''; \
echo '#ifndef GNUMERIC_PATHS_H'; \
echo '#define GNUMERIC_PATHS_H'; \
echo ''; \
echo '#define GNUMERIC_PREFIX "$(prefix)"'; \
echo '#define GNUMERIC_SYSCONFDIR "$(sysconfdir)"'; \
echo '#define GNUMERIC_DATADIR "$(gnumeric_datadir)"'; \
echo '#define GNUMERIC_LIBDIR "$(gnumeric_libdir)"'; \
echo '#define GNUMERIC_ICONDIR "$(gnumeric_icondir)"'; \
echo '#define GNUMERIC_LOCALEDIR "$(gnumeric_localedir)"'; \
echo ''; \
echo '#endif /* GNUMERIC_PATHS_H */'; \
) >$@
if WITH_WIN32
gnumeric_rc.o: gnumeric.rc
......@@ -372,7 +383,7 @@ uninstall-hook:
EXTRA_DIST = GNOME_Gnumeric-gtk.xml.in \
main-component.c \
$(GNUMERIC_GNOME) README.gnm_float \
gnumeric-paths.sh.in gnumeric.rc gnm-i18n.h $(UNUSED)
gnumeric.rc gnm-i18n.h $(UNUSED)
# silence intltool
UNUSED = test-pango.c
......
......@@ -80,7 +80,7 @@ base_files = \
dialogs.h \
tool-dialogs.h
gladedir = $(gnumeric_gladedir)
gladedir = $(gnumeric_datadir)/glade
glade_DATA = \
advanced-filter.glade \
anova-one.glade \
......
#!/bin/sh -e
prefix="@prefix@"
exec_prefix="@exec_prefix@"
sysconfdir="@sysconfdir@"
datadir="@datadir@"
libdir="@libdir@"
DATADIRNAME="@DATADIRNAME@"
gnumeric_version="@gnumeric_version@"
gnumeric_prefix="@gnumeric_prefix@"
gnumeric_sysconfdir="@gnumeric_sysconfdir@"
gnumeric_datadir="@gnumeric_datadir@"
gnumeric_libdir="@gnumeric_libdir@"
gnumeric_icondir="@gnumeric_icondir@"
gnumeric_localedir="@gnumeric_localedir@"
cat <<EOF
/* This file has been automatically generated. Do not edit. */
#ifndef GNUMERIC_PATHS_H
#define GNUMERIC_PATHS_H
#define GNUMERIC_VERSION "$gnumeric_version"
#define GNUMERIC_PREFIX "$gnumeric_prefix"
#define GNUMERIC_SYSCONFDIR "$gnumeric_sysconfdir"
#define GNUMERIC_DATADIR "$gnumeric_datadir"
#define GNUMERIC_LIBDIR "$gnumeric_libdir"
#define GNUMERIC_ICONDIR "$gnumeric_icondir"
#define GNUMERIC_LOCALEDIR "$gnumeric_localedir"
#endif /* GNUMERIC_PATHS_H */
EOF
......@@ -29,12 +29,14 @@ autoformats = \
autoformat.List.lila.xml.in \
autoformat.List.simple.xml.in
EXTRA_DIST = $(autoformats) $(autoformat_categories:%=%.category.in)
EXTRA_DIST = $(autoformats) $(autoformat_categories:=.category.in)
autoformatdir = $(gnumeric_datadir)/autoformat-templates
install-data-local:
@echo "AutoFormats" ; \
for cat in $(autoformat_categories) ; do \
dir=$(DESTDIR)$(gnumeric_autoformatdir)/$$cat ; \
dir=$(DESTDIR)$(autoformatdir)/$$cat ; \
echo "-> $$cat" ; \
$(mkinstalldirs) $$dir ; \
sed -e 's/ _description *=/ description=/' \
......@@ -54,5 +56,5 @@ install-data-local:
uninstall-local:
for cat in $(autoformat_categories) ; do \
rm -rf $(DESTDIR)$(gnumeric_autoformatdir)/$$cat ; \
rm -rf $(DESTDIR)$(autoformatdir)/$$cat ; \
done
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