--- makefile.orig	2014-05-15 19:48:07.000000000 +0000
+++ makefile
@@ -61,15 +61,14 @@ ALL_OPTIONS	= $(MAKE_OPT) SOCKET="$(SOCK
 	GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
 	prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
 	SOEXT="$(SOEXT)" BUILD_DOC_SCRIPT="false" GNAT="$(GNAT)" \
-	T2A="../../$(BDIR)/static/tools/templates2ada" \
+	T2A="$(prefix)/bin/templates2ada" \
 	LIBRARY_TYPE="$(LIBRARY_TYPE)" PYTHON="$(PYTHON)" \
 	TARGET="$(TARGET)" IS_CROSS=$(IS_CROSS) GPRINSTALL="$(GPRINSTALL)"
 
 build-doc:
 	echo ""
 	echo "=== Build doc"
-	${MAKE} -C docs html latexpdf
-	${MAKE} -C templates_parser/docs html latexpdf
+	${MAKE} -C docs html
 
 run_regtests:
 	echo ""
@@ -343,4 +342,5 @@ gen_setup:
 setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE)
 
 setup_tp:
-	$(MAKE) -C templates_parser setup $(GALL_OPTIONS)
+	echo "Templates Parser has already been externally built"
+	#$(MAKE) -C templates_parser setup $(GALL_OPTIONS)