On 3 Jul 2001, Thayne Harbaugh wrote:

> On 03 Jul 2001 20:38:55 +0200, Christoph Egger wrote:
> > 
> > On Tue, 3 Jul 2001, Christoph Egger wrote:
> > 
> > > 
> > > Hi!
> > > 
> > > 
> > > I tried to fix the same issue in libgalloc as you did with libgii.
> > 
> > Here is an update.
> >  
> > > Is the fix right?
> > 
> > 
> > Index: Makefile.am
> > ===================================================================
> > RCS file: /cvsroot/ggi/ggi-core/libgalloc/Makefile.am,v
> > retrieving revision 1.1.1.1
> > diff -u -r1.1.1.1 Makefile.am
> > --- Makefile.am 2001/04/21 18:08:16     1.1.1.1
> > +++ Makefile.am 2001/07/03 18:37:32
> > @@ -3,7 +3,7 @@
> > 
> >  SUBDIRS = galloc include display demos doc m4
> > 
> > -ggiconfdatadir = @ggi_confdir@
> > +ggiconfdatadir = $(sysconfdir)/@ggi_confdir@
> >  ggiconfdata_DATA = libgalloc.conf
> > 
> >  DISTCLEANFILES = libgalloc.conf
> 
> Ahh, configure.in fixes have been added - I just remembered these myself
> and was going to mention them.
> 
> > Index: configure.in
> > ===================================================================
> > RCS file: /cvsroot/ggi/ggi-core/libgalloc/configure.in,v
> > retrieving revision 1.3
> > diff -u -r1.3 configure.in
> > --- configure.in        2001/05/18 13:48:37     1.3
> > +++ configure.in        2001/07/03 18:37:32
> > @@ -230,15 +230,12 @@
> >  test "x$prefix" = xNONE && prefix=$ac_default_prefix
> >  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
> > 
> > -eval foo="$libdir"
> > -eval ggi_libdir="$foo"
> > -eval ggi_confdir="$sysconfdir/ggi"
> > +eval ggi_confdir="ggi"
> > 
> > -AC_SUBST(ggi_libdir)
> >  AC_SUBST(ggi_confdir)
> >  AC_DEFINE_UNQUOTED(GALLOCTAGLEN,$TAGLEN)
> >  AC_DEFINE_UNQUOTED(GALLOCPATHTAG,"$PATHTAG")
> > -AC_DEFINE_UNQUOTED(GALLOCCONFFILE,"$PATHTAG$ggi_confdir/$galloc_conffile")
> > 
>+AC_DEFINE_UNQUOTED(GALLOCCONFFILE,"$PATHTAG$sysconfdir/$ggi_confdir/$galloc_conffile")
> >  AM_CONFIG_HEADER(config.h)
> > 
> > Index: libgalloc.conf.in
> > ===================================================================
> > RCS file: /cvsroot/ggi/ggi-core/libgalloc/libgalloc.conf.in,v
> > retrieving revision 1.1.1.1
> > diff -u -r1.1.1.1 libgalloc.conf.in
> > --- libgalloc.conf.in   2001/04/21 18:08:18     1.1.1.1
> > +++ libgalloc.conf.in   2001/07/03 18:37:32
> > @@ -1,5 +1,5 @@
> >  # Mapping file for suggest-strings to libraries
> > -.root: @ggi_libdir@/ggi/galloc
> > +.root: @libdir@/ggi/galloc
> >  #
> >  # suggest_name                 library_name
> > versions
> >  # ------------                 ------------------------
> > --------
> > Index: galloc/Makefile.am
> > ===================================================================
> > RCS file: /cvsroot/ggi/ggi-core/libgalloc/galloc/Makefile.am,v
> > retrieving revision 1.2
> > diff -u -r1.2 Makefile.am
> > --- galloc/Makefile.am  2001/05/31 16:16:43     1.2
> > +++ galloc/Makefile.am  2001/07/03 18:37:33
> > @@ -1,5 +1,5 @@
> >  INCLUDES = -DBUILDING_LIBGALLOC -I$(top_srcdir)/include
> > $(extra_includes)
> > -libgalloc_la_LIBADD = -lggi -lgg
> > +libgalloc_la_LIBADD = -lggi -L../gg -lgg
> > 
> >  lib_LTLIBRARIES = libgalloc.la
> > 
> 
> I still think that galloc/Makefile.am shouldn't be changed with -L../gg
> because when libgalloc is compiled lgg should already be installed in
> system library dirs.

Fixed.

I am going to commit this to CVS now.


CU,

Christoph Egger
E-Mail: [EMAIL PROTECTED]

Reply via email to