diff --git a/ChangeLog b/ChangeLog
index d47a22c..e91cccf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-15  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* makefile: shortend a bit, and disabled auto generation of 
+	api xml files
+	* api/makefile: Added installation target
+
 2003-09-13  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
 	* sources/Dia.metadata: Hide references to DiaShapeViewInfo, cause
diff --git a/api/makefile b/api/makefile
index 8ecff84..a003c62 100644
--- a/api/makefile
+++ b/api/makefile
@@ -16,5 +16,9 @@ all: generated-stamp
 generated-stamp: $(API) 
 	gapi_codegen.exe --include $(INCLUDE_API) --generate $(API) && touch generated-stamp
 
+install:
+	install -o root -g root -m 644 dia-api.xml $(PREFIX)/share/gapi
+	install -o root -g root -m 644 dia-symbols.xml $(PREFIX)/share/gapi
+
 clean:
 	rm -f generated-stamp
diff --git a/makefile b/makefile
index d71a181..ea1a78e 100644
--- a/makefile
+++ b/makefile
@@ -1,38 +1,18 @@
-API_DIR=api
-CODE_DIR=dia
-SAMPLE_DIR=sample
-SOURCES_DIR=sources
-DOC_DIR=doc
-GLUE_DIR=glue
+DIRS=glue api dia doc
 
-all: code library samples docs diaglue
+all: build
 
-xml:	
-	$(MAKE) -C $(SOURCES_DIR)
-
-code:	
-	$(MAKE) -C $(API_DIR)
-
-library:
-	$(MAKE) -C $(CODE_DIR)
-
-samples:
-	$(MAKE) -C $(SAMPLE_DIR)
-
-docs:
-	$(MAKE) -C $(DOC_DIR)
-
-diaglue:
-	$(MAKE) -C $(GLUE_DIR)
+build:
+	for i in $(DIRS); do                    \
+		$(MAKE) -C $$i || exit 1;	\
+	done
 
 install:
-	$(MAKE) -C $(CODE_DIR) install
-	$(MAKE) -C $(GLUE_DIR) install
-	$(MAKE) -C $(DOC_DIR) install
+	for i in $(DIRS); do                     	\
+		$(MAKE) -C $$i install || exit 1;	\
+	done
 
 clean:
-	$(MAKE) -C $(API_DIR) clean
-	$(MAKE) -C $(CODE_DIR) clean
-	$(MAKE) -C $(SAMPLE_DIR) clean
-	$(MAKE) -C $(DOC_DIR) clean
-	$(MAKE) -C $(GLUE_DIR) clean
+	for i in $(DIRS); do        	     	\
+		$(MAKE) -C $$i clean || exit 1;	\
+	done