--- src/Mixfix/global.hh.orig	2008-08-11 02:03:45.000000000 +0200

+++ src/Mixfix/global.hh	2008-08-11 02:04:25.000000000 +0200

@@ -36,6 +36,7 @@

 #define PRELUDE_NAME	"prelude.maude"

 #define MAUDE_LIB	"MAUDE_LIB"

+#define MAUDE_DATA_DIR	"%%DATADIR%%"

 bool

 findPrelude(string& directory, string& fileName);

--- src/Mixfix/global.cc.orig	2008-08-11 01:48:58.000000000 +0200

+++ src/Mixfix/global.cc	2008-08-11 01:53:15.000000000 +0200

@@ -81,6 +81,8 @@

       directory = ".";

       if (directoryManager.checkAccess(directory, fileName, R_OK, ext))

 	return true;

+      if (directoryManager.checkAccess(MAUDE_DATA_DIR, fileName, R_OK,  ext))

+	return true;

       if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK, ext))

 	return true;

       if (!(executableDirectory.empty()) &&

--- src/Main/main.cc.orig	2008-08-11 01:48:40.000000000 +0200

+++ src/Main/main.cc	2008-08-11 01:55:01.000000000 +0200

@@ -267,6 +267,11 @@

       directory = executableDirectory;

       return true;

     }

+  if (directoryManager.checkAccess(MAUDE_DATA_DIR, fileName, R_OK))

+    {

+      directory = MAUDE_DATA_DIR;

+      return true;

+    }

   if (directoryManager.checkAccess(".", fileName, R_OK))

     {

       directory = ".";

--- src/Main/Makefile.in.orig	2007-02-02 19:22:06.000000000 -0600

+++ src/Main/Makefile.in	2010-09-28 10:17:08.000000000 -0500

@@ -1,2 +1,2 @@

-# Makefile.in generated by automake 1.9.1 from Makefile.am.

+# Makefile.in generated by automake 1.10.3 from Makefile.am.

 # @configure_input@

@@ -4,3 +4,4 @@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,

+# Inc.

 # This Makefile.in is free software; the Free Software Foundation

@@ -16,6 +17,3 @@

-SOURCES = $(maude_SOURCES)

-srcdir = @srcdir@

-top_srcdir = @top_srcdir@

 VPATH = @srcdir@

@@ -24,5 +22,3 @@

 pkgincludedir = $(includedir)/@PACKAGE@

-top_builddir = ../..

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-INSTALL = @INSTALL@

 install_sh_DATA = $(install_sh) -c -m 644

@@ -50,3 +46,3 @@

 CONFIG_CLEAN_FILES =

-am__installdirs = "$(DESTDIR)$(bindir)"

+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)"

 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

@@ -55,6 +51,3 @@

 maude_OBJECTS = $(am_maude_OBJECTS)

-@BUILD_COMPILER_TRUE@am__DEPENDENCIES_1 =  \

-@BUILD_COMPILER_TRUE@	../FullCompiler/libfullCompiler.a

-am__DEPENDENCIES_2 =

-@USE_DLMALLOC_TRUE@am__DEPENDENCIES_3 = ../3rdParty/libdlmalloc.a

+am__DEPENDENCIES_1 =

 maude_DEPENDENCIES = ../Mixfix/libmixfix.a \

@@ -71,7 +64,6 @@

 	../MSCP10/libmscp10.a ../Temporal/libtemporal.a \

-	../IO_Stuff/libIO_Stuff.a $(am__DEPENDENCIES_1) \

-	../Utility/libutility.a $(am__DEPENDENCIES_2) \

-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \

-	$(am__DEPENDENCIES_3)

-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

+	../IO_Stuff/libIO_Stuff.a $(FULL_COMPILER_LIB) \

+	../Utility/libutility.a $(am__DEPENDENCIES_1) \

+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(DLMALLOC_LIB)

+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/depcomp

@@ -85,2 +77,10 @@

 DIST_SOURCES = $(maude_SOURCES)

+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

+am__vpath_adj = case $$p in \

+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

+    *) f=$$p;; \

+  esac;

+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

+dataDATA_INSTALL = $(INSTALL_DATA)

+DATA = $(data_DATA)

 ETAGS = etags

@@ -89,4 +89,2 @@

 ACLOCAL = @ACLOCAL@

-AMDEP_FALSE = @AMDEP_FALSE@

-AMDEP_TRUE = @AMDEP_TRUE@

 AMTAR = @AMTAR@

@@ -98,4 +96,2 @@

 BUDDY_LIB = @BUDDY_LIB@

-BUILD_COMPILER_FALSE = @BUILD_COMPILER_FALSE@

-BUILD_COMPILER_TRUE = @BUILD_COMPILER_TRUE@

 CC = @CC@

@@ -118,2 +114,4 @@

 GMP_LIBS = @GMP_LIBS@

+GREP = @GREP@

+INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -127,2 +125,3 @@

 MAKEINFO = @MAKEINFO@

+MKDIR_P = @MKDIR_P@

 OBJEXT = @OBJEXT@

@@ -133,2 +132,3 @@

 PACKAGE_TARNAME = @PACKAGE_TARNAME@

+PACKAGE_URL = @PACKAGE_URL@

 PACKAGE_VERSION = @PACKAGE_VERSION@

@@ -140,13 +140,9 @@

 TECLA_LIBS = @TECLA_LIBS@

-USE_DLMALLOC_FALSE = @USE_DLMALLOC_FALSE@

-USE_DLMALLOC_TRUE = @USE_DLMALLOC_TRUE@

 VERSION = @VERSION@

+abs_builddir = @abs_builddir@

+abs_srcdir = @abs_srcdir@

+abs_top_builddir = @abs_top_builddir@

+abs_top_srcdir = @abs_top_srcdir@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

-ac_ct_RANLIB = @ac_ct_RANLIB@

-ac_ct_STRIP = @ac_ct_STRIP@

-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@

-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@

 am__include = @am__include@

@@ -162,3 +158,7 @@

 build_vendor = @build_vendor@

+builddir = @builddir@

 datadir = @datadir@

+datarootdir = @datarootdir@

+docdir = @docdir@

+dvidir = @dvidir@

 exec_prefix = @exec_prefix@

@@ -169,2 +169,3 @@

 host_vendor = @host_vendor@

+htmldir = @htmldir@

 includedir = @includedir@

@@ -174,2 +175,3 @@

 libexecdir = @libexecdir@

+localedir = @localedir@

 localstatedir = @localstatedir@

@@ -178,8 +180,22 @@

 oldincludedir = @oldincludedir@

+pdfdir = @pdfdir@

 prefix = @prefix@

 program_transform_name = @program_transform_name@

+psdir = @psdir@

 sbindir = @sbindir@

 sharedstatedir = @sharedstatedir@

+srcdir = @srcdir@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

+top_build_prefix = @top_build_prefix@

+top_builddir = @top_builddir@

+top_srcdir = @top_srcdir@

+data_DATA = \

+	prelude.maude \

+	model-checker.maude \

+	socket.maude \

+	linear.maude \

+	machine-int.maude \

+	term-order.maude

+

 @BUILD_COMPILER_TRUE@FULL_COMPILER_LIB = ../FullCompiler/libfullCompiler.a

@@ -260,4 +276,4 @@

 	    *$$dep*) \

-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

-		&& exit 0; \

+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

+	        && { if test -f $@; then exit 0; else break; fi; }; \

 	      exit 1;; \

@@ -310,3 +326,3 @@

 	@rm -f maude$(EXEEXT)

-	$(CXXLINK) $(maude_LDFLAGS) $(maude_OBJECTS) $(maude_LDADD) $(LIBS)

+	$(CXXLINK) $(maude_OBJECTS) $(maude_LDADD) $(LIBS)

@@ -321,4 +337,4 @@

 .cc.o:

-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \

-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi

+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

@@ -328,4 +344,4 @@

 .cc.obj:

-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \

-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi

+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

@@ -335,4 +351,4 @@

 maude-main.o: main.cc

-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maude-main.o -MD -MP -MF "$(DEPDIR)/maude-main.Tpo" -c -o maude-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc; \

-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/maude-main.Tpo" "$(DEPDIR)/maude-main.Po"; else rm -f "$(DEPDIR)/maude-main.Tpo"; exit 1; fi

+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maude-main.o -MD -MP -MF $(DEPDIR)/maude-main.Tpo -c -o maude-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc

+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/maude-main.Tpo $(DEPDIR)/maude-main.Po

 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.cc' object='maude-main.o' libtool=no @AMDEPBACKSLASH@

@@ -342,4 +358,4 @@

 maude-main.obj: main.cc

-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maude-main.obj -MD -MP -MF "$(DEPDIR)/maude-main.Tpo" -c -o maude-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi`; \

-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/maude-main.Tpo" "$(DEPDIR)/maude-main.Po"; else rm -f "$(DEPDIR)/maude-main.Tpo"; exit 1; fi

+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maude-main.obj -MD -MP -MF $(DEPDIR)/maude-main.Tpo -c -o maude-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi`

+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/maude-main.Tpo $(DEPDIR)/maude-main.Po

 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.cc' object='maude-main.obj' libtool=no @AMDEPBACKSLASH@

@@ -347,3 +363,19 @@

 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o maude-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi`

-uninstall-info-am:

+install-dataDATA: $(data_DATA)

+	@$(NORMAL_INSTALL)

+	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"

+	@list='$(data_DATA)'; for p in $$list; do \

+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

+	  f=$(am__strip_dir) \

+	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \

+	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \

+	done

+

+uninstall-dataDATA:

+	@$(NORMAL_UNINSTALL)

+	@list='$(data_DATA)'; for p in $$list; do \

+	  f=$(am__strip_dir) \

+	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \

+	  rm -f "$(DESTDIR)$(datadir)/$$f"; \

+	done

@@ -354,4 +386,4 @@

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	mkid -fID $$unique

@@ -367,4 +399,4 @@

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

@@ -378,3 +410,2 @@

 	tags=; \

-	here=`pwd`; \

 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \

@@ -383,4 +414,4 @@

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	test -z "$(CTAGS_ARGS)$$tags$$unique" \

@@ -398,18 +429,17 @@

 distdir: $(DISTFILES)

-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \

-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

-	list='$(DISTFILES)'; for file in $$list; do \

-	  case $$file in \

-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \

-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \

-	  esac; \

+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

+	list='$(DISTFILES)'; \

+	  dist_files=`for file in $$list; do echo $$file; done | \

+	  sed -e "s|^$$srcdirstrip/||;t" \

+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \

+	case $$dist_files in \

+	  */*) $(mkdir_p) `echo "$$dist_files" | \

+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \

+			   sort -u` ;; \

+	esac; \

+	for file in $$dist_files; do \

 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \

-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \

-	    dir="/$$dir"; \

-	    $(mkdir_p) "$(distdir)$$dir"; \

-	  else \

-	    dir=''; \

-	  fi; \

 	  if test -d $$d/$$file; then \

+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

@@ -426,5 +456,5 @@

 check: check-am

-all-am: Makefile $(PROGRAMS)

+all-am: Makefile $(PROGRAMS) $(DATA)

 installdirs:

-	for dir in "$(DESTDIR)$(bindir)"; do \

+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)"; do \

 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \

@@ -471,2 +501,4 @@

+html-am:

+

 info: info-am

@@ -475,3 +507,7 @@

-install-data-am:

+install-data-am: install-dataDATA

+

+install-dvi: install-dvi-am

+

+install-dvi-am:

@@ -479,6 +515,20 @@

+install-html: install-html-am

+

+install-html-am:

+

 install-info: install-info-am

+install-info-am:

+

 install-man:

+install-pdf: install-pdf-am

+

+install-pdf-am:

+

+install-ps: install-ps-am

+

+install-ps-am:

+

 installcheck-am:

@@ -502,3 +552,5 @@

-uninstall-am: uninstall-binPROGRAMS uninstall-info-am

+uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA

+

+.MAKE: install-am install-strip

@@ -508,8 +560,11 @@

 	html-am info info-am install install-am install-binPROGRAMS \

-	install-data install-data-am install-exec install-exec-am \

-	install-info install-info-am install-man install-strip \

-	installcheck installcheck-am installdirs maintainer-clean \

-	maintainer-clean-generic mostlyclean mostlyclean-compile \

-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \

-	uninstall-am uninstall-binPROGRAMS uninstall-info-am

+	install-data install-data-am install-dataDATA install-dvi \

+	install-dvi-am install-exec install-exec-am install-html \

+	install-html-am install-info install-info-am install-man \

+	install-pdf install-pdf-am install-ps install-ps-am \

+	install-strip installcheck installcheck-am installdirs \

+	maintainer-clean maintainer-clean-generic mostlyclean \

+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \

+	tags uninstall uninstall-am uninstall-binPROGRAMS \

+	uninstall-dataDATA