jhbuild r1825 - trunk

[fpeters svn gnome org]

Author: fpeters
Date: Wed Jan 16 17:24:02 2008
New Revision: 1825
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1825&view=rev

Log:
* Makefile.am, configure.ac: updated bug-report part of AC_INIT to
point to Bugzilla instead of James email.  Updated with a GNOME version
number and make dist(check) support to be nice.



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Jan 16 17:24:02 2008
@@ -1,15 +1,17 @@
 SUBDIRS = doc
 
-PATCHES = $(shell ls patches/*.patch)
-SOURCES = $(shell find jhbuild/ -name *.py) jhbuild/defaults.jhbuildrc
-MODULE_SETS = $(shell ls modulesets/*.modules) modulesets/moduleset.dtd
+PATCHES = $(wildcard $(top_srcdir)/patches/*.patch)
+SOURCES = $(shell find $(top_srcdir)/jhbuild/ -name *.py) jhbuild/defaults.jhbuildrc
+MODULE_SETS = $(wildcard $(top_srcdir)/modulesets/*.modules) modulesets/moduleset.dtd
 
 EXTRA_DIST = gnome-doc-utils.make $(PATCHES) $(SOURCES) $(MODULE_SETS) \
-	scripts/hg-update.py Makefile.plain
+	scripts/hg-update.py Makefile.plain install-check.c
 
+# those won't be executed by make distcheck, it is necessary as they build
+# in source tree and do install to ~/bin/
 all-local:
-	$(MAKE) -f Makefile.plain
+	test z"$(srcdir)" = z"." && $(MAKE) -f Makefile.plain || true
 
 install-exec-local:
-	$(MAKE) -f Makefile.plain install
+	test z"$(srcdir)" = z"." && $(MAKE) -f Makefile.plain install || true
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Jan 16 17:24:02 2008
@@ -1,4 +1,5 @@
-AC_INIT([jhbuild], [0.1], [james jamesh id au])
+AC_INIT([jhbuild], [2.21.5],
+		[http://bugzilla.gnome.org/enter_bug.cgi?product=jhbuild])
 AC_CONFIG_SRCDIR(jhbuild/main.py)
 AM_INIT_AUTOMAKE
 GNOME_COMMON_INIT