3 files changed, 16 insertions, 6 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index c586c77..209b64b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,6 +11,6 @@ distclean-local:
 init: init.in
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," init.in > init
 menu: generate_menu
-        ./generate_menu
+        sh ./generate_menu
         @regex_cmd@ -e "s,\@VERSION\@,$(VERSION)," menu.in > menu.pre
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," menu.pre > menu
diff --git a/data/Makefile.in b/data/Makefile.in
index c1c7725..1c871b0 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -106,9 +106,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/Makefile
+        cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
         cd $(top_builddir) \
           && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -226,6 +226,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = data
 
 distdir: $(DISTFILES)
+        here=`cd $(top_builddir) && pwd`; \
+        top_distdir=`cd $(top_distdir) && pwd`; \
+        distdir=`cd $(distdir) && pwd`; \
+        cd $(top_srcdir) \
+          && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu data/Makefile
         @for file in $(DISTFILES); do \
           d=$(srcdir); \
           if test -d $$d/$$file; then \
@@ -324,7 +329,7 @@ distclean-local:
 init: init.in
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," init.in > init
 menu: generate_menu
-        ./generate_menu
+        sh ./generate_menu
         @regex_cmd@ -e "s,\@VERSION\@,$(VERSION)," menu.in > menu.pre
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," menu.pre > menu
 
diff --git a/data/styles/Makefile.in b/data/styles/Makefile.in
index 8e3e3f4..54318df 100644
--- a/data/styles/Makefile.in
+++ b/data/styles/Makefile.in
@@ -106,9 +106,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/styles/Makefile
+        cd $(top_srcdir) && $(AUTOMAKE) --gnu data/styles/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
         cd $(top_builddir) \
           && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -140,6 +140,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = data/styles
 
 distdir: $(DISTFILES)
+        here=`cd $(top_builddir) && pwd`; \
+        top_distdir=`cd $(top_distdir) && pwd`; \
+        distdir=`cd $(distdir) && pwd`; \
+        cd $(top_srcdir) \
+          && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu data/styles/Makefile
         @for file in $(DISTFILES); do \
           d=$(srcdir); \
           if test -d $$d/$$file; then \