removed Makelocal.local, moved tasks into Documentation makefile

Documentation/Makefile.files

@@ -4,6 +4,11 @@
 ## --SECTION--                                                     DOCUMENTATION
 ## -----------------------------------------------------------------------------
 
+MANUAL_DST=www@www.arangodb.org:/var/www/www.arangodb.org/avoc/manuals
+
+OUTPUT_FOLDER=Doxygen/manuals/$(PACKAGE_VERSION)
+
+
 ################################################################################
 ### @brief pages
 ################################################################################
@@ -354,6 +359,37 @@ CLEANUP += \
 	Doxygen/.setup-directories \
         Doxygen/*
 
+
+################################################################################
+## publish
+################################################################################
+
+.PHONY: publish publish-html publish-pdf publish-copy
+
+publish: examples publish-html publish-pdf
+	make publish-copy
+
+publish-copy:
+	cd Doxygen/manuals && scp -r "$(PACKAGE_VERSION)" $(MANUAL_DST)
+
+publish-html:
+	$(MAKE) doxygen
+	mkdir -p $(OUTPUT_FOLDER)/images
+	@for w in $(WIKI); do cp Doxygen/website/$$w.html $(OUTPUT_FOLDER); done
+	@for i in `ls Doxygen/website/images/*.png`; do cp $$i $(OUTPUT_FOLDER)/images/; done
+	@cp Doxygen/website/arangodb.css $(OUTPUT_FOLDER)
+	@cp Documentation/Manual/shell_reference_card.pdf $(OUTPUT_FOLDER)
+
+publish-pdf: $(OUTPUT_FOLDER)
+	$(MAKE) latex
+	cp Doxygen/latex/dba-manual.pdf $(OUTPUT_FOLDER)
+	cp Doxygen/latex/implementor-manual.pdf $(OUTPUT_FOLDER)
+	cp Doxygen/latex/install-manual.pdf $(OUTPUT_FOLDER)
+	cp Doxygen/latex/user-manual.pdf $(OUTPUT_FOLDER)
+	cp Doxygen/latex/ref-manual.pdf $(OUTPUT_FOLDER)
+	cp Doxygen/latex/imp-manual.pdf $(OUTPUT_FOLDER)
+	cp Documentation/Manual/shell_reference_card.pdf $(OUTPUT_FOLDER)
+
 ## -----------------------------------------------------------------------------
 ## --SECTION--                                                       END-OF-FILE
 ## -----------------------------------------------------------------------------

Documentation/Manual/Home.md

@@ -41,7 +41,7 @@ ArangoDB's User Manuals {#ArangoDBUserManual}
 
 - also see the @ref Glossary
 
-- @EXTREF{arangodb_1.4_shell_reference_card.pdf,Cheat Sheet} 
+- @EXTREF{shell_reference_card.pdf,Cheat Sheet} 
 
 ArangoDB's Administrator Manuals {#ArangoDBAdminManual}
 =======================================================

Installation/Makefile.local

@@ -1,35 +0,0 @@
-# -*- mode: Makefile; -*-
-
-MANUAL_DST=www@www.arangodb.org:/var/www/www.arangodb.org/avoc/manuals
-
-OUTPUT_FOLDER=Doxygen/manuals/$(PACKAGE_VERSION)
-
-################################################################################
-## publish
-################################################################################
-
-.PHONY: publish publish-html publish-pdf publish-copy
-
-publish: examples publish-html publish-pdf
-	make publish-copy
-
-publish-copy:
-	cd Doxygen/manuals && scp -r "$(PACKAGE_VERSION)" $(MANUAL_DST)
-
-publish-html:
-	$(MAKE) doxygen
-	mkdir -p $(OUTPUT_FOLDER)/images
-	@for w in $(WIKI); do cp Doxygen/website/$$w.html $(OUTPUT_FOLDER); done
-	@for i in `ls Doxygen/website/images/*.png`; do cp $$i $(OUTPUT_FOLDER)/images/; done
-	@cp Doxygen/website/arangodb.css $(OUTPUT_FOLDER)
-	@cp Documentation/Manual/arangodb_$(MAJOR_MINOR)_shell_reference_card.pdf $(OUTPUT_FOLDER)
-
-publish-pdf: $(OUTPUT_FOLDER)
-	$(MAKE) latex
-	cp Doxygen/latex/dba-manual.pdf $(OUTPUT_FOLDER)
-	cp Doxygen/latex/implementor-manual.pdf $(OUTPUT_FOLDER)
-	cp Doxygen/latex/install-manual.pdf $(OUTPUT_FOLDER)
-	cp Doxygen/latex/user-manual.pdf $(OUTPUT_FOLDER)
-	cp Doxygen/latex/ref-manual.pdf $(OUTPUT_FOLDER)
-	cp Doxygen/latex/imp-manual.pdf $(OUTPUT_FOLDER)
-	cp Documentation/Manual/arangodb_$(MAJOR_MINOR)_shell_reference_card.pdf $(OUTPUT_FOLDER)

Makefile.am

@@ -281,12 +281,6 @@ install-data-local:
 build_posix.h: configure.ac
 	@echo '#define TRIAGENS_VERSION "@PACKAGE_VERSION@"' > build_posix.h
 
-################################################################################
-### @brief local modifications
-################################################################################
-
--include Installation/Makefile.local
-
 ################################################################################
 ### @brief source files
 ################################################################################