diff -Naur simulavr-0.0.12.ori/Makefile.am simulavr-0.0.12/Makefile.am
--- simulavr-0.0.12.ori/Makefile.am	Tue Dec 11 01:31:07 2001
+++ simulavr-0.0.12/Makefile.am	Mon Dec 31 00:50:49 2001
@@ -46,3 +46,6 @@
 	for file in $(AUX_DIST) $(AUX_DIST_EXTRA); do \
 		cp $$file $(distdir)/$$file; \
 	done
+
+pdf:
+	(cd doc && $(MAKE) $(AM_MAKEFLAGS) pdf)
diff -Naur simulavr-0.0.12.ori/Makefile_AVR_Rules simulavr-0.0.12/Makefile_AVR_Rules
--- simulavr-0.0.12.ori/Makefile_AVR_Rules	Sun Dec 30 19:06:24 2001
+++ simulavr-0.0.12/Makefile_AVR_Rules	Sun Dec 30 23:43:23 2001
@@ -27,7 +27,7 @@
 
 DEFS                 =
 CFLAGS               = -g -Wall $(AVR_TARGET)
-INCLUDES             = $(AVR_INC_DIR)
+INCLUDES             = -I$(srcdir) $(AVR_INC_DIR)
 CC                   = $(AVR_CC)
 
 .elf.hex:
@@ -40,7 +40,7 @@
 	$(AVR_OBJDUMP) -h -S -D --stabs --disassemble-zeroes $< > $@
 
 .asm.elf:
-	$(AVR_AS) $(AVR_TARGET) -o $@ $<
+	$(AVR_AS) $(AVR_TARGET) $(INCLUDES) -o $@ $<
 
 SUFFIXES = .asm .elf .hex .bin .lst
 
diff -Naur simulavr-0.0.12.ori/doc/Makefile.am simulavr-0.0.12/doc/Makefile.am
--- simulavr-0.0.12.ori/doc/Makefile.am	Thu Dec  6 02:34:55 2001
+++ simulavr-0.0.12/doc/Makefile.am	Mon Dec 31 00:39:56 2001
@@ -18,9 +18,15 @@
 # Rule for generating html output.
 html: $(info_TEXINFOS)
 	mkdir -p html
-	texi2html -split_node $(info_TEXINFOS)
+	texi2html -split_node $(srcdir)/$(info_TEXINFOS)
 	mv *.html html
-	cp html/simulavr.html html/index.html
+	if test -f html/simulavr.html ; then \
+	   cp html/simulavr.html html/index.html ; \
+	else \
+	   if test -f html/simulavr_toc.html ; then \
+	      cp html/simulavr_toc.html html/index.html ; \
+	   fi \
+	fi
 
 #
 # I'm not generating PDF files by default. pdftex seems to