X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=Makefile;h=47f3530f2048976f1c7701a553c33095e6c13e2a;hb=refs%2Fheads%2Fv0.8;hp=22be0d96c36875614958ccd481f1f00bc20bd8fa;hpb=efc0c865ba914e75a6c3c9220450d13f752c7afa;p=github%2Fshaarli%2FShaarli.git

diff --git a/Makefile b/Makefile
index 22be0d96..47f3530f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@
 # - install Xdebug for PHPUnit code coverage reports:
 #   - see http://xdebug.org/docs/install
 #   - enable in php.ini
+SHELL := /bin/bash
 
 BIN = vendor/bin
 PHP_SOURCE = index.php application tests plugins
@@ -137,6 +138,7 @@ test:
 # to ease deployment on shared hosting.
 ##
 ARCHIVE_VERSION := shaarli-$$(git describe)-full
+ARCHIVE_PREFIX=Shaarli/
 
 release_archive: release_tar release_zip
 
@@ -147,13 +149,17 @@ composer_dependencies: clean
 
 ### generate a release tarball and include 3rd-party dependencies
 release_tar: composer_dependencies
-	git archive -o $(ARCHIVE_VERSION).tar HEAD
-	tar rvf $(ARCHIVE_VERSION).tar vendor/
+	git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD
+	tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/
+	gzip $(ARCHIVE_VERSION).tar
 
 ### generate a release zip and include 3rd-party dependencies
 release_zip: composer_dependencies
-	git archive -o $(ARCHIVE_VERSION).zip -9 HEAD
-	zip -r $(ARCHIVE_VERSION).zip vendor/
+	git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD
+	mkdir $(ARCHIVE_PREFIX)
+	rsync -a vendor/ $(ARCHIVE_PREFIX)vendor/
+	zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)vendor/
+	rm -rf $(ARCHIVE_PREFIX)
 
 ##
 # Targets for repository and documentation maintenance
@@ -198,14 +204,18 @@ htmlsidebar:
 htmlpages:
 	@for file in `find doc/ -maxdepth 1 -name "*.md"`; do \
 		base=`basename $$file .md`; \
-		sed -i "1i #$${base//-/ }" $$file; \
+		sed -i "1i # $${base//-/ }" $$file; \
 		awk 'BEGIN { FS = "[\\[\\]]{2}" }'\
 	'm = /\[/ { t=$$2; gsub(/ /, "-", $$2); print $$1"["t"]("$$2".html)"$$3 }'\
 	'!m { print $$0 }' $$file > doc/tmp.md; \
 		mv doc/tmp.md $$file; \
-		pandoc -f markdown_github -t html5 -s \
+		pandoc  -f gfm \
+			-t html5 \
+			-s \
 			-c "github-markdown.css" \
-			-T Shaarli -M pagetitle:"$${base//-/ }" -B doc/sidebar.html \
+			-T Shaarli \
+			-M pagetitle:"$${base//-/ }" \
+			-B doc/sidebar.html \
 			-o doc/$$base.html $$file; \
 	done;