Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3

Conflicts:
	configure

packages/gecode/Makefile.in

@@ -69,6 +69,9 @@ gecode.yap: $(srcdir)/gecode$(GECODE_MAJOR)_yap_hand_written.yap $(srcdir)/$(GEC
 clean:
 	-rm -f *.o *.so *~ gecode.yap
 
+realclean:
+	-rm -f $(SOBJS) Makefile 
+
 install: all
 	mkdir -p $(DESTDIR)$(YAPLIBDIR)
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
@@ -76,3 +79,5 @@ install: all
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 	$(INSTALL) gecode.yap $(DESTDIR)$(SHAREDIR)/Yap
 	$(INSTALL) $(srcdir)/clpfd.yap $(DESTDIR)$(SHAREDIR)/Yap/gecode
+
+install-examples:

packages/gecode/configure.in

@@ -20,11 +20,11 @@ AC_ARG_ENABLE(gecode,
          fi], use_gecode=$have_gecode)
 
 if test "$use_gecode" = no; then
-  ENABLE_GECODE="@# "
+  PKG_GECODE=""
 else
-  ENABLE_GECODE=""
+  PKG_GECODE="packages/gecode"
 fi
-AC_SUBST(ENABLE_GECODE)
+AC_SUBST(PKG_GECODE)
 
 AC_MSG_CHECKING([if dynamic arrays are supported])
 
@@ -90,3 +90,8 @@ fi
 
 AC_SUBST(GECODE_VERSION)
 AC_SUBST(GECODE_EXTRALIBS)
+
+if test "$PKG_GECODE" = "packages/gecode"; then
+AC_CONFIG_FILES([packages/gecode/Makefile])
+fi
+