gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-5-g124db24)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  124db2417dbfc6a44c8d1d01213c4c3e7609d93e (commit)
       via  a4230797942c161eefba44a8dc069e6506ad09c1 (commit)
      from  0fc90255d0bba10031606afaaad06c84191ecc44 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gattrib/src/Makefile.am |    6 +++---
 gschem/src/Makefile.am  |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


=================
 Commit Messages
=================

commit 124db2417dbfc6a44c8d1d01213c4c3e7609d93e
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Use $(includedir) instead of $(prefix)/include and $(libdir) instead of $(prefix)/lib.
    
    This makes sure things still work when some of the less mainstream configure
    arguments are used.

:100644 100644 6374bba... 765a1b9... M	gschem/src/Makefile.am

commit a4230797942c161eefba44a8dc069e6506ad09c1
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Include $(includedir) in the header search path and $(libdir) in the library search path.
    
    This fixes builds where an out of date libgeda may be found some where.  The
    change is based on what is already in gschem/src/Makefile.am

:100644 100644 c446e51... ab28a33... M	gattrib/src/Makefile.am

=========
 Changes
=========

commit 124db2417dbfc6a44c8d1d01213c4c3e7609d93e
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Use $(includedir) instead of $(prefix)/include and $(libdir) instead of $(prefix)/lib.
    
    This makes sure things still work when some of the less mainstream configure
    arguments are used.

diff --git a/gschem/src/Makefile.am b/gschem/src/Makefile.am
index 6374bba..765a1b9 100644
--- a/gschem/src/Makefile.am
+++ b/gschem/src/Makefile.am
@@ -74,8 +74,8 @@ if CCISGCC
 AM_CFLAGS = -Wall
 endif
 
-INCLUDES = -I$(prefix)/include -I$(top_srcdir)/intl -I$(top_srcdir)/include @GSCHEM_CFLAGS@
-gschem_LDADD = -L$(prefix)/lib @GSCHEM_LDFLAGS@ @LIBINTL@
+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_srcdir)/include @GSCHEM_CFLAGS@
+gschem_LDADD = -L$(libdir) @GSCHEM_LDFLAGS@ @LIBINTL@
 
 localedir = @datadir@/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@

commit a4230797942c161eefba44a8dc069e6506ad09c1
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Include $(includedir) in the header search path and $(libdir) in the library search path.
    
    This fixes builds where an out of date libgeda may be found some where.  The
    change is based on what is already in gschem/src/Makefile.am

diff --git a/gattrib/src/Makefile.am b/gattrib/src/Makefile.am
index c446e51..ab28a33 100644
--- a/gattrib/src/Makefile.am
+++ b/gattrib/src/Makefile.am
@@ -36,9 +36,9 @@ gattrib_SOURCES = \
 		gattrib.c 
 
 
-INCLUDES = -I$(top_srcdir)/include @GATTRIB_CFLAGS@
-gattrib_LDFLAGS = @GATTRIB_LDFLAGS@
-gattrib_LDADD = @GATTRIB_LDFLAGS@
+INCLUDES = -I$(includedir) -I$(top_srcdir)/include @GATTRIB_CFLAGS@
+gattrib_LDFLAGS = -L$(libdir) @GATTRIB_LDFLAGS@
+gattrib_LDADD = -L$(libdir) @GATTRIB_LDFLAGS@
 
 ## Don't need these right now.
 ## man_MANS = gattrib.1




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs