arch linux prefers pkgconfig for finding lua

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0df126fe3de89f4329d5f6f4fe4d0ec5786e4ba6..bb29cd0c02ce9bd61aa72f4363d499e3e4ad9329 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,25 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data src
-EXTRA_DIST = extra
+SUBDIRS = data doc src
 
-if WIN32
-else
-       SUBDIRS += doc
-endif
+EXTRA_DIST = autogen.sh extra
 
-run: all
-       $(MAKE) -C src run
 
-debug: all
-       $(MAKE) -C src debug
+.PHONY: run debug docs package
 
+run: all
+       @cd src && $(MAKE) run
 
-.PHONY: docs package
+debug: all
+       @cd src && $(MAKE) debug
 
 docs:
        $(DOXYGEN)
 
 if WIN32
 package: all
-       $(MAKE) -C win32 installer
+       @cd win32 && $(MAKE) installer
 else
 package: dist-bzip2
 endif