gnome-mud r696 - in trunk: . src

[lharris svn gnome org]

Author: lharris
Date: Sat Jul 26 03:21:25 2008
New Revision: 696
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=696&view=rev

Log:
Autotools fixes


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

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Jul 26 03:21:25 2008
@@ -1,14 +1,15 @@
 SUBDIRS = data doc plugins po src ui
 
-schemadir = $(sysconfdir)/gconf/schemas
+ INTLTOOL_SCHEMAS_RULE@
+ INTLTOOL_DESKTOP_RULE@
+
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = gnome-mud.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
 
 Applicationsdir = $(datadir)/applications
 Applications_in_files = gnome-mud.desktop.in
 Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = \
 	ABOUT-NLS \
@@ -40,13 +41,11 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper
 
+install-data-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-	  for p in $(schemas_DATA) ; do \
-	    GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-          done \
-        fi
-else
-install-data-local:
+	if test -z "$(DESTDIR)"; then \
+		for p in $^ ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
+		done \
+	fi
 endif

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jul 26 03:21:25 2008
@@ -49,8 +49,12 @@
 AC_DEFINE(GETTEXT_PACKAGE, "gnome-mud", [Gettext domain name])
 
 dnl gconf tests
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
 AM_GCONF_SOURCE_2
+AC_PATH_PROG(GCONFTOOL, gconftool-2)
+
+if test x"$GCONFTOOL" = xno; then
+	AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+fi
 
 dnl pkg-config dep checks
 GMODULE_REQUIRED=2.0.0

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Jul 26 03:21:25 2008
@@ -14,8 +14,7 @@
 LDADD   = $(GMUD_LIBS) $(Z_LIBS) $(MSP_LIBS)
 AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
 
-gamesdir = $(prefix)/games
-games_PROGRAMS = gnome-mud
+bin_PROGRAMS = gnome-mud
 
 gnome_mud_SOURCES =				\
 	gconf-helper.c				\