[gob] Sat Oct 09 12:20:06 2010 Jiri (George) Lebl <jirka 5z com>

[George Lebl <jirka src gnome org>]

commit be01597030b3dc4a5e0c74bdf14784dadc4191c8
Author: Jiri (George) Lebl <jirka 5z com>
Date:   Sat Oct 9 12:20:13 2010 -0700

    Sat Oct 09 12:20:06 2010  Jiri (George) Lebl <jirka 5z com>
    
    	* configure.in, src/Makefile.am: fixup some brokeneness, Thanks to
    	  Roland Clobus for sending a patch to make Cygwin build work

 ChangeLog       |    5 +++++
 configure.in    |    6 ------
 src/Makefile.am |    4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 996835f..f3ea219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 09 12:20:06 2010  Jiri (George) Lebl <jirka 5z com>
+
+	* configure.in, src/Makefile.am: fixup some brokeneness, Thanks to
+	  Roland Clobus for sending a patch to make Cygwin build work
+
 Tue Jun 01 02:33:02 2010  Jiri (George) Lebl <jirka 5z com>
 
 	* doc/gob2.1.in, src/main.c, gob2.m4:  Apply patches sent by
diff --git a/configure.in b/configure.in
index a88ebd1..39aa729 100644
--- a/configure.in
+++ b/configure.in
@@ -19,16 +19,10 @@ dnl Is there a way to test NOINSTGOB here ?
 if test -f ../NOINST_GOB ; then
   AC_MSG_RESULT([*** NOT Going to install GOB ***])
   SUBDIRS="src examples"
-  INSTGOB=""
-  NOINSTGOB="gob2"
 else
   SUBDIRS="src examples doc"
-  INSTGOB="gob2"
-  NOINSTGOB=""
 fi
 AC_SUBST(SUBDIRS)
-AC_SUBST(INSTGOB)
-AC_SUBST(NOINSTGOB)
 
 dnl Checks for programs.
 AC_ISC_POSIX
diff --git a/src/Makefile.am b/src/Makefile.am
index 585fe09..e72178f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,9 +21,9 @@ INCLUDES = \
 	-I$(includedir)
 
 if NOINSTGOB
-noinst_PROGRAMS = @NOINSTGOB@
+noinst_PROGRAMS = gob2
 else
-bin_PROGRAMS = @INSTGOB@
+bin_PROGRAMS = gob2
 endif
 EXTRA_PROGRAMS = gob2