diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 9b43390f1499c4c606049182ad75e2c58efc1d5a..c62826c28441d409aef064b60b96c0eacacbb29e 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -1,4 +1,4 @@
-// $Id: CommandLine.cpp,v 1.18 2003-04-19 22:11:42 geuzaine Exp $
+// $Id: CommandLine.cpp,v 1.19 2003-06-13 16:53:07 geuzaine Exp $
 //
 // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 //
@@ -122,13 +122,16 @@ char *Get_BuildOptions(void)
   
   if(first){
 #if defined(HAVE_GSL)
-    strcat(opt, "HAVE_GSL ");
+    strcat(opt, "GSL ");
 #endif
 #if defined(HAVE_TRIANGLE)
-    strcat(opt, "HAVE_TRIANGLE ");
+    strcat(opt, "TRIANGLE ");
 #endif
 #if defined(HAVE_LIBJPEG)
-    strcat(opt, "HAVE_LIBJPEG ");
+    strcat(opt, "JPEG ");
+#endif
+#if defined(HAVE_LIBPNG)
+    strcat(opt, "PNG ");
 #endif
     first = 0;
   }
diff --git a/Makefile b/Makefile
index a714a6ca1c75e5c43fef276ef8517bf048a5f92c..1389684e4d2df9c25a7023433e006b63980a134d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.290 2003-06-01 00:12:53 geuzaine Exp $
+# $Id: Makefile,v 1.291 2003-06-13 16:53:07 geuzaine Exp $
 #
 # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 #
@@ -82,17 +82,19 @@ parser:
 converters:
 	cd utils/converters/autocad && ${MAKE}
 
+.PHONY: doc
+doc:
+	cd doc/texinfo && ${MAKE} all
+	cd doc && tar zcvf ../gmsh-${GMSH_RELEASE}-doc.tgz\
+          FAQ CONTRIBUTORS VERSIONS README.win32 gmsh.1\
+          texinfo/gmsh.ps texinfo/gmsh.pdf texinfo/gmsh.txt\
+          texinfo/*.html texinfo/gmsh-info.tgz
+
 doc-info:
 	cd doc/texinfo && ${MAKE} info
 
-doc-ps:
-	cd doc/texinfo && ${MAKE} ps
-
-doc-pdf:
-	cd doc/texinfo && ${MAKE} pdf
-
 purge:
-	for i in . bin lib utils archives demos tutorial doc ${GMSH_DIRS}; \
+	for i in . bin lib utils archives demos tutorial doc doc/texinfo ${GMSH_DIRS}; \
         do (cd $$i && rm -f *~ *~~ .gmsh-tmp .gmsh-errors gmon.out); \
         done
 
diff --git a/archives/Makefile b/archives/Makefile
index a6927ad9800e4d8a4d0d47ceb4a8248557b48a3f..247632f771197afcd97cee34dc889547dd4ad1e2 100644
--- a/archives/Makefile
+++ b/archives/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2003-03-21 00:52:46 geuzaine Exp $
+# $Id: Makefile,v 1.6 2003-06-13 16:53:07 geuzaine Exp $
 #
 # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 #
@@ -19,6 +19,6 @@
 # 
 # Please report all bugs and problems to "gmsh@geuz.org".
 
-purge:
+clean:
 	rm -f *~
 
diff --git a/doc/Makefile b/doc/Makefile
index 2cb8880a66ba1ecceead43c7e788f5c9f7382818..43ba1c31712810583d6d78793894756dc95c5c59 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.10 2003-04-15 21:49:43 geuzaine Exp $
+# $Id: Makefile,v 1.11 2003-06-13 16:53:07 geuzaine Exp $
 #
 # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 #
@@ -19,14 +19,6 @@
 # 
 # Please report all bugs and problems to "gmsh@geuz.org".
 
-all:
-	cd texinfo && ${MAKE} all
-	gtar zcvf gmsh-doc.tgz\
-          FAQ CONTRIBUTORS VERSIONS README.win32 \
-          texinfo/gmsh.ps texinfo/gmsh.pdf texinfo/gmsh.txt\
-          texinfo/*.html \
-          texinfo/gmsh-info.tgz gmsh.1 
-
 clean:
-	rm -f *~ .*~ gmsh.ps gmsh.pdf gmsh.info*
+	rm -f *~ .*~
 	cd texinfo && ${MAKE} clean
diff --git a/doc/texinfo/Makefile b/doc/texinfo/Makefile
index 0a1292bde027cbb3edeb36255641594dd5bbec81..1fc2040eca594b4ac6c8bfad1c7c44f7db5b6a3e 100644
--- a/doc/texinfo/Makefile
+++ b/doc/texinfo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2003-04-19 17:24:28 geuzaine Exp $
+# $Id: Makefile,v 1.6 2003-06-13 16:53:07 geuzaine Exp $
 #
 # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 #
@@ -59,5 +59,5 @@ all: ps pdf html html1 infoz txt
 clean:
 	rm -f *.cp* *.fn* *.ky* *.pg* *.tp* *.vr* *.mv*\
           *.log *.toc *.aux *.dvi *.html *.txt\
-          gmsh.ps gmsh.pdf gmsh.info* gmsh-info.tgz gmsh-doc.tgz
+          gmsh.ps gmsh.pdf gmsh.info* gmsh-info.tgz