Index: Makefile.in
--- Makefile.in.orig	2009-06-24 19:24:54 +0200
+++ Makefile.in	2009-06-25 09:12:56 +0200
@@ -41,8 +41,8 @@
 OPTS = $(DEFS) $(CFLAGS)
 INCL = -I . @INCL@
 
-CXX = @CXX@ -Wall -ansi
-CC = @CC@ -Wall -ansi
+CXX = @CXX@ @CPPFLAGS@ @CXXFLAGS@
+CC = @CC@ @CPPFLAGS@ @CFLAGS@
 MAKEDEPEND = $(OPTS) -O0 -M -DDEPEND
 BISON = bison
 LEX = @LEX@
@@ -152,14 +152,14 @@
 
 install: asy-keywords.el install-texhash install-man
 
-install-all: asy-keywords.el install-texhash install-html
+install-all: asy-keywords.el
 
 install-texhash: install-asy
 	-if test -z "$(DESTDIR)"; then \
 	  texhash; \
 	fi
 
-install-asy: asy
+install-asy:
 	${INSTALL} -d $(bindir) $(asydir) $(GUIdir) $(exampledir) \
           $(animationsdir)
 	-${INSTALL} -d $(latexdir)
@@ -167,7 +167,7 @@
 	${INSTALL} -p -m 755 $(NAME) $(bindir)
 	${INSTALL} -p -m 644 asy-keywords.el base/*.asy $(addprefix base/,$(EXTRA)) $(asydir)
 	${INSTALL} -p -m 755 GUI/*.py $(GUIdir)
-	ln -sf @datadir@/asymptote/GUI/xasy.py $(bindir)/$(XNAME)
+	ln $(datadir)/asymptote/GUI/xasy.py $(bindir)/$(XNAME)
 	${INSTALL} -p -m 644 examples/*.asy $(addprefix examples/,$(EXEXTRA)) \
 	  doc/extra/*.asy $(addprefix doc/,$(DOCEXTRA)) $(exampledir)
 	${INSTALL} -p -m 644 examples/animations/*.asy \
Index: doc/Makefile.in
--- doc/Makefile.in.orig	2009-06-22 05:24:26 +0200
+++ doc/Makefile.in	2009-06-25 09:11:55 +0200
@@ -4,10 +4,10 @@
 ASY = ../asy -dir ../base -config "" -render=0
 DOCFILES = asymptote.pdf CAD.pdf
 
-docdir = $(DESTDIR)@docdir@
+docdir = $(DESTDIR)@prefix@/share/doc/asymptote
 infodir = $(DESTDIR)@infodir@
 datarootdir = @datarootdir@
-INSTALL = @INSTALL@
+INSTALL = @prefix@/bin/ginstall -c
 TEXI2DVI = @TEXI2DVI@
 
 export docdir infodir INSTALL