IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change libgsf/goffice libraries and paths to be gnucash-specific.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13003 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Joshua Sled
2006-01-28 18:57:29 +00:00
parent 41ba299b51
commit a3f4252965
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2006-01-28 Joshua Sled <jsled@asynchronous.org>
* lib/libgsf-1.12.3/gsf-gnome/Makefile.am (pkglib_LTLIBRARIES)
* lib/libgsf-1.12.3/gsf/Makefile.am (pkglib_LTLIBRARIES)
* lib/goffice-0.0.4/goffice/Makefile.am (pkglib_LTLIBRARIES)
* configure.in: Use pkglib automake variables to install in a
gnucash-specific hierearchy; change configure.in paths for goffice
for similar reasons. Bug#328858.
2006-01-25 Joshua Sled <jsled@asynchronous.org>
* src/gnome/glade/sched-xact.glade: Bug#327775: consistency in

6
configure.in
View File

@@ -1245,9 +1245,9 @@ dnl * Config defaults
dnl ******************
dnl
dnl These are changed in goffice.c for WIN32 packages
AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_VERSION}')
AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_VERSION}')
AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice')
AC_SUBST(goffice_datadir, '${datadir}/gnucash/goffice/${GOFFICE_VERSION}')
AC_SUBST(goffice_libdir, '${libdir}/gnucash/goffice/${GOFFICE_VERSION}')
AC_SUBST(goffice_icondir, '${datadir}/gnucash/pixmaps/goffice')
AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale')
dnl
AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins')

2
lib/goffice-0.0.4/goffice/Makefile.am
View File

@@ -1,6 +1,6 @@
SUBDIRS = utils data app graph gtk drawing ms-compat cut-n-paste
lib_LTLIBRARIES = libgoffice-1.la
pkglib_LTLIBRARIES = libgoffice-1.la
libgoffice_1_la_LIBADD = \
cut-n-paste/pcre/libpcre.la \

2
lib/libgsf-1.12.3/gsf-gnome/Makefile.am
View File

@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/lib/libgsf-1.12.3 $(LIBGSF_GNOME_CFLAGS)
if WITH_LIBGSF_GNOME
lib_LTLIBRARIES = libgsf-gnome-1.la
pkglib_LTLIBRARIES = libgsf-gnome-1.la
libgsf_gnome_1_la_LIBADD = $(top_builddir)/lib/libgsf-1.12.3/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS)
libgsf_gnome_1_la_LDFLAGS = -version-info $(VERSION_INFO)

2
lib/libgsf-1.12.3/gsf/Makefile.am
View File

@@ -13,7 +13,7 @@ endif
AM_CPPFLAGS = -I$(top_srcdir)/lib/libgsf-1.12.3 $(LIBGSF_CFLAGS) $(Z_CPPFLAGS) \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
lib_LTLIBRARIES = libgsf-1.la
pkglib_LTLIBRARIES = libgsf-1.la
libgsf_1_la_LIBADD = $(LIBGSF_LIBS) $(Z_LIBS) $(BZ2_LIBS)
libgsf_1_la_LDFLAGS = -version-info $(VERSION_INFO)