X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=Makefile.in;h=2d89badc876a4b53efa26e04f53d78add391a789;hb=a79048dea516d52f42056e26c04d6375c93c03d8;hp=a5694ce30e5b92b725bd361e23b7cb397296e6db;hpb=7540aa4c58ce36f9c6588f9bb41d1a25d745889d;p=gnushogi.git

diff --git a/Makefile.in b/Makefile.in
index a5694ce..2d89bad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,14 +25,18 @@
 #
 
 VERSION     = 1.3.2
-GNUSHOGIDIR = ./gnushogi
-XSHOGIDIR   = ./xshogi
+ROOT        = @top_srcdir@
+BUILDROOT   = @top_builddir@
+GNUSHOGIDIR = $(BUILDROOT)/gnushogi
+XSHOGIDIR   = $(BUILDROOT)/xshogi
+
+PROGNAME = @PROGNAME@
 
 #
 # Default targets.
 #
 
-all : gnushogi_compile pat2inc gnushogi.bbk @XSHOGI@ 
+all : gnushogi_compile pat2inc bbk @XSHOGI@
 
 
 #
@@ -40,19 +44,19 @@ all : gnushogi_compile pat2inc gnushogi.bbk @XSHOGI@
 #
 
 gnushogi_compile:
-	-cd $(GNUSHOGIDIR); $(MAKE) gnushogi
+	-cd $(GNUSHOGIDIR) && $(MAKE) $(PROGNAME)
 
 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
+bbk:
+	-cd $(GNUSHOGIDIR) && $(MAKE) $(PROGNAME).bbk
 
 
 #
@@ -62,10 +66,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 +80,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 +99,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 +116,7 @@ DISTCLEANFILES = \
 
 distclean: clean
 	rm -rf $(DISTCLEANFILES)
-	cd doc; $(MAKE) distclean
+	cd $(BUILDROOT)/doc && $(MAKE) distclean
 
 #
 # Extra cleanup, for the maintainer only.
@@ -122,4 +126,4 @@ MAINTAINERCLEANFILES = configure config.h.in
 
 maintainerclean: distclean
 	rm -f $(MAINTAINERCLEANFILES)
-	cd doc; $(MAKE) maintainerclean
+	cd $(BUILDROOT)/doc && $(MAKE) maintainerclean