Fix various regression for building out of tree.

[gnushogi.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a5694ce..93b5f1d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,8 +25,10 @@
 #
 
 VERSION     = 1.3.2
-GNUSHOGIDIR = ./gnushogi
-XSHOGIDIR   = ./xshogi
+ROOT        = @top_srcdir@
+BUILDROOT   = @top_builddir@
+GNUSHOGIDIR = $(BUILDROOT)/gnushogi
+XSHOGIDIR   = $(BUILDROOT)/xshogi
 
 #
 # Default targets.
@@ -40,19 +42,19 @@ all : gnushogi_compile pat2inc gnushogi.bbk @XSHOGI@
 #
 
 gnushogi_compile:
-       -cd $(GNUSHOGIDIR); $(MAKE) gnushogi
+       -cd $(GNUSHOGIDIR) && $(MAKE) gnushogi
 
 pat2inc:
-       -cd $(GNUSHOGIDIR); $(MAKE) pat2inc
+       -cd $(GNUSHOGIDIR) && $(MAKE) pat2inc
 
 sizetest:
-       -cd $(GNUSHOGIDIR); $(MAKE) sizetest
+       -cd $(GNUSHOGIDIR) && $(MAKE) sizetest
 
 xshogi_compile:
-       -cd $(XSHOGIDIR); $(MAKE)
+       -cd $(XSHOGIDIR) && $(MAKE)
 
 gnushogi.bbk:
-       -cd $(GNUSHOGIDIR); $(MAKE) gnushogi.bbk
+       -cd $(GNUSHOGIDIR) && $(MAKE) gnushogi.bbk
 
 
 #
@@ -62,10 +64,10 @@ gnushogi.bbk:
 install: gnushogi_install @XSHOGIINSTALL@
 
 gnushogi_install:
-       -cd $(GNUSHOGIDIR); $(MAKE) install
+       -cd $(GNUSHOGIDIR) && $(MAKE) install
 
 xshogi_install: $(XSHOGIDIR)/xshogi
-       -cd $(XSHOGIDIR); $(MAKE) install
+       -cd $(XSHOGIDIR) && $(MAKE) install
 
 
 
@@ -76,13 +78,13 @@ xshogi_install: $(XSHOGIDIR)/xshogi
 clean: gnushogi_clean @XSHOGICLEAN@ doc_clean
 
 gnushogi_clean:
-       cd $(GNUSHOGIDIR); $(MAKE) clean
+       cd $(GNUSHOGIDIR) && $(MAKE) clean
 
 xshogi_clean:
-       cd $(XSHOGIDIR); $(MAKE) clean
+       cd $(XSHOGIDIR) && $(MAKE) clean
 
 doc_clean:
-       cd doc; $(MAKE) clean
+       cd $(BUILDROOT)/doc && $(MAKE) clean
 
 
 #
@@ -95,8 +97,8 @@ dist:
        $(MAKE) maintainerclean
        rm -rf $(DISTNAME)
        mkdir $(DISTNAME)
-       tar -cf - --exclude .git . | (cd $(DISTNAME) && tar -xf -)
-       cd $(DISTNAME) && ./autogen.sh && ./configure
+       tar -cf - --exclude .git $(ROOT) | (cd $(DISTNAME) && tar -xf -)
+       cd $(DISTNAME) && $(ROOT)/autogen.sh && $(ROOT)/configure
        cd $(DISTNAME)/doc && $(MAKE) info
        cd $(DISTNAME) && make distclean
        tar -zcf $(DISTNAME).tar.gz $(DISTNAME)
@@ -112,7 +114,7 @@ DISTCLEANFILES = \
 
 distclean: clean
        rm -rf $(DISTCLEANFILES)
-       cd doc; $(MAKE) distclean
+       cd $(BUILDROOT)/doc && $(MAKE) distclean
 
 #
 # Extra cleanup, for the maintainer only.
@@ -122,4 +124,4 @@ MAINTAINERCLEANFILES = configure config.h.in
 
 maintainerclean: distclean
        rm -f $(MAINTAINERCLEANFILES)
-       cd doc; $(MAKE) maintainerclean
+       cd $(BUILDROOT)/doc && $(MAKE) maintainerclean