X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=Makefile.in;h=18fee5bb3a2431a152766579e1206e788d30d09c;hb=d1fc17a64ea26ddcf34d044e6d51c884b368c66c;hp=a99bacc21329261d2648160397d4dac7d3f92a51;hpb=3aebd048e74e6ec12367f62cdda386ccc55a6854;p=paraslash.git

diff --git a/Makefile.in b/Makefile.in
index a99bacc2..18fee5bb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,11 +23,16 @@ codename := volatile relativity
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
 m4_ggo_dir := m4/gengetopt
-ggo_dir := ggo
-object_dir := objects
-man_dir := man/man1
 test_dir := t
-cmdline_dir := cmdline
+ifeq ("$(origin O)", "command line")
+	build_dir := $(O)
+else
+	build_dir := build
+endif
+ggo_dir := $(build_dir)/ggo
+object_dir := $(build_dir)/objects
+man_dir := $(build_dir)/man/man1
+cmdline_dir := $(build_dir)/cmdline
 
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -290,7 +295,7 @@ clean2: clean
 distclean: clean2 test-clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
 	$(Q) rm -f Makefile autoscan.log config.status config.log
-	$(Q) rm -rf autom4te.cache aclocal.m4
+	$(Q) rm -rf autom4te.cache
 	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean