diff options
Diffstat (limited to 'www/aws/files/patch-makefile')
| -rw-r--r-- | www/aws/files/patch-makefile | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/www/aws/files/patch-makefile b/www/aws/files/patch-makefile index e91eeca06a2d..88d3ca23cc4e 100644 --- a/www/aws/files/patch-makefile +++ b/www/aws/files/patch-makefile @@ -1,12 +1,27 @@ -Prevent empty ${EXAMPLESDIR}/bin directory from being created - ---- makefile.orig 2013-07-03 01:11:54.000000000 +0000 +--- makefile.orig 2014-05-15 19:48:07.000000000 +0000 +++ makefile -@@ -390,7 +390,6 @@ endif - $(MKDIR) -p $(DESTDIR)$(I_AGP) - $(MKDIR) -p $(DESTDIR)$(I_TPL) - $(MKDIR) -p $(DESTDIR)$(I_IMG) -- $(MKDIR) -p $(DESTDIR)$(I_SBN) - $(MKDIR) -p $(DESTDIR)$(I_PLG) - $(MKDIR) -p $(DESTDIR)$(I_WEL) +@@ -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) |