[jhbuild] do not install modulesets

[Frederic Peters <fpeters src gnome org>]

commit b5c7e7104fc63503228354e0d3bb8c367b551784
Author: Frédéric Péters <fpeters 0d be>
Date:   Tue May 12 13:52:07 2009 +0200

    do not install modulesets
---
 Makefile.am                |    9 +++------
 jhbuild/defaults.jhbuildrc |    5 +----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 475f9e5..10e67b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,8 @@ if DOC_INSTALLATION_ENABLED
 SUBDIRS += doc
 endif
 
-patchesdir = $(datadir)/jhbuild/patches/
-patches_DATA = $(wildcard $(top_srcdir)/patches/*.patch)
-
-modulesetsdir = $(datadir)/jhbuild/modulesets/
-modulesets_DATA = $(wildcard $(top_srcdir)/modulesets/*.modules) modulesets/moduleset.dtd
+PATCHES = $(wildcard $(top_srcdir)/patches/*.patch)
+MODULESETS = $(wildcard $(top_srcdir)/modulesets/*.modules) modulesets/moduleset.dtd
 
 
 INTLTOOL = 			\
@@ -16,7 +13,7 @@ INTLTOOL = 			\
 	intltool-merge.in 	\
 	intltool-update.in
 
-EXTRA_DIST = gnome-doc-utils.make $(patches_DATA) $(modulesets_DATA) \
+EXTRA_DIST = gnome-doc-utils.make $(PATCHES) $(MODULESETS) \
 	install-check.c \
 	jhbuild.desktop $(INTLTOOL)
 
diff --git a/jhbuild/defaults.jhbuildrc b/jhbuild/defaults.jhbuildrc
index ba4a517..2150314 100644
--- a/jhbuild/defaults.jhbuildrc
+++ b/jhbuild/defaults.jhbuildrc
@@ -8,10 +8,7 @@ if 'GTK_PATH' in os.environ.keys():
     del os.environ['GTK_PATH']
 
 # module directory
-if DATADIR:
-    modulesets_dir = os.path.join(DATADIR, 'jhbuild/modulesets')
-else:
-    modulesets_dir = os.path.join(os.path.dirname(__file__), '../modulesets')
+modulesets_dir = os.path.join(SRCDIR, 'modulesets')
 
 # what modules to build?
 moduleset = 'gnome-2.28'