[Gnucash-changes] r13003 - gnucash/trunk - Change libgsf/goffice libraries and paths to be gnucash-specific.

[Joshua Sled]

Author: jsled
Date: 2006-01-28 13:57:29 -0500 (Sat, 28 Jan 2006)
New Revision: 13003
Trac: http://svn.gnucash.org/trac/changeset/13003

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
   gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am
   gnucash/trunk/lib/libgsf-1.12.3/gsf-gnome/Makefile.am
   gnucash/trunk/lib/libgsf-1.12.3/gsf/Makefile.am
Log:
Change libgsf/goffice libraries and paths to be gnucash-specific.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-28 18:45:48 UTC (rev 13002)
+++ gnucash/trunk/ChangeLog	2006-01-28 18:57:29 UTC (rev 13003)
@@ -1,3 +1,12 @@
+2006-01-28  Joshua Sled  <jsled at 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 at asynchronous.org>
 
 	* src/gnome/glade/sched-xact.glade: Bug#327775: consistency in

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-01-28 18:45:48 UTC (rev 13002)
+++ gnucash/trunk/configure.in	2006-01-28 18:57:29 UTC (rev 13003)
@@ -1245,9 +1245,9 @@
 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')

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am	2006-01-28 18:45:48 UTC (rev 13002)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am	2006-01-28 18:57:29 UTC (rev 13003)
@@ -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		\

Modified: gnucash/trunk/lib/libgsf-1.12.3/gsf/Makefile.am
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/gsf/Makefile.am	2006-01-28 18:45:48 UTC (rev 13002)
+++ gnucash/trunk/lib/libgsf-1.12.3/gsf/Makefile.am	2006-01-28 18:57:29 UTC (rev 13003)
@@ -13,7 +13,7 @@
 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)

Modified: gnucash/trunk/lib/libgsf-1.12.3/gsf-gnome/Makefile.am
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/gsf-gnome/Makefile.am	2006-01-28 18:45:48 UTC (rev 13002)
+++ gnucash/trunk/lib/libgsf-1.12.3/gsf-gnome/Makefile.am	2006-01-28 18:57:29 UTC (rev 13003)
@@ -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)