gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-312-gc7dfc63)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  c7dfc632ea75a802822fc139a93a96a3dfdcd1b2 (commit)
       via  d2ab7cfcc4dd21e06a3d2e9ac6d756b7968c0b7a (commit)
      from  d5f4b1882e98bde4f26e93e243fdb8d0ba120e99 (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/data/Makefile.am             |    2 +-
 gnetlist/tests/hierarchy/Makefile.am |    3 ++-
 gschem/data/Makefile.am              |    2 +-
 libgeda/data/Makefile.am             |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)


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

commit c7dfc632ea75a802822fc139a93a96a3dfdcd1b2
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date:   Tue Nov 18 22:47:00 2008 -0500

    When testing gnetlist, point to the one we just built.
    
    Make sure that 'make check' works correctly prior to installation.  The
    old test seemed to be picking up a previously installed gnetlist instead
    of the one we just built.  Makes for some confusing debugging if there is
    another version installed and in your path somewhere.

:100644 100644 cf20e94... 25907cb... M	gnetlist/tests/hierarchy/Makefile.am

commit d2ab7cfcc4dd21e06a3d2e9ac6d756b7968c0b7a
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date:   Tue Nov 18 22:33:45 2008 -0500

    Use the SHELL variable to locate a shell for icon-theme-installer
    
    /bin/sh on some systems like SunOS (solaris) is too broken but in those
    cases SHELL is typically set to a functioning shell like /bin/ksh.  This
    repairs the install on "shell challenged" systems.

:100644 100644 cd224be... 1d2428b... M	gattrib/data/Makefile.am
:100644 100644 062facd... 5a56aae... M	gschem/data/Makefile.am
:100644 100644 83ca538... b4e75dc... M	libgeda/data/Makefile.am

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

commit c7dfc632ea75a802822fc139a93a96a3dfdcd1b2
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date:   Tue Nov 18 22:47:00 2008 -0500

    When testing gnetlist, point to the one we just built.
    
    Make sure that 'make check' works correctly prior to installation.  The
    old test seemed to be picking up a previously installed gnetlist instead
    of the one we just built.  Makes for some confusing debugging if there is
    another version installed and in your path somewhere.

diff --git a/gnetlist/tests/hierarchy/Makefile.am b/gnetlist/tests/hierarchy/Makefile.am
index cf20e94..25907cb 100644
--- a/gnetlist/tests/hierarchy/Makefile.am
+++ b/gnetlist/tests/hierarchy/Makefile.am
@@ -11,13 +11,14 @@ check_SCRIPTS = tests
 
 BUILDDIR=$(top_builddir)/tests/hierarchy
 SRCDIR=$(srcdir)
+GNETLIST=$(top_builddir)/src/gnetlist
 
 tests:
 	rm -f $(BUILDDIR)/new_*
 	( export TESTDIR=$(SRCDIR); \
 	  echo $$TESTDIR; \
 	  cp -f $(SRCDIR)/gnetlistrc.hierarchy $(BUILDDIR)/gnetlistrc; \
-	  gnetlist \
+	  $(GNETLIST) \
 	     -o $(BUILDDIR)/new_hierarchy.geda -g geda \
 	     $(SRCDIR)/top.sch )
 	diff $(SRCDIR)/hierarchy.geda $(BUILDDIR)/new_hierarchy.geda; \

commit d2ab7cfcc4dd21e06a3d2e9ac6d756b7968c0b7a
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date:   Tue Nov 18 22:33:45 2008 -0500

    Use the SHELL variable to locate a shell for icon-theme-installer
    
    /bin/sh on some systems like SunOS (solaris) is too broken but in those
    cases SHELL is typically set to a functioning shell like /bin/ksh.  This
    repairs the install on "shell challenged" systems.

diff --git a/gattrib/data/Makefile.am b/gattrib/data/Makefile.am
index cd224be..1d2428b 100644
--- a/gattrib/data/Makefile.am
+++ b/gattrib/data/Makefile.am
@@ -23,7 +23,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 install_icon_exec = \
-	$(top_srcdir)/icon-theme-installer \
+	$(SHELL) $(top_srcdir)/icon-theme-installer \
 	-t $(theme) \
 	-s $(srcdir) \
 	-d "x$(DESTDIR)" \
diff --git a/gschem/data/Makefile.am b/gschem/data/Makefile.am
index 062facd..5a56aae 100644
--- a/gschem/data/Makefile.am
+++ b/gschem/data/Makefile.am
@@ -23,7 +23,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 install_icon_exec = \
-	$(top_srcdir)/icon-theme-installer \
+	$(SHELL) $(top_srcdir)/icon-theme-installer \
 	-t $(theme) \
 	-s $(srcdir) \
 	-d "x$(DESTDIR)" \
diff --git a/libgeda/data/Makefile.am b/libgeda/data/Makefile.am
index 83ca538..b4e75dc 100644
--- a/libgeda/data/Makefile.am
+++ b/libgeda/data/Makefile.am
@@ -45,7 +45,7 @@ application_DATA = $(application_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 install_icon_exec = \
-	$(top_srcdir)/icon-theme-installer \
+	$(SHELL) $(top_srcdir)/icon-theme-installer \
 	-t $(theme) \
 	-s $(srcdir) \
 	-d "x$(DESTDIR)" \




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