X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=Makefile;h=f4bd866b2d1c4007f07fed9f6e5084eae406aff6;hp=9ca8a43485e98d0dae2354384f31a24dccc53408;hb=6359370c21819973a396b6277bcf3f04b25aa565;hpb=21658d381a6daa564ccb42cb70b43667f9410fba

diff --git a/Makefile b/Makefile
index 9ca8a43..f4bd866 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 BASH_SCRIPTS = grml-debootstrap
 SHELL_SCRIPTS = chroot-script
-MKSH_SCRIPTS = bootgrub.mksh
 DOCBOOK_XML=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
 
 all: doc
@@ -10,16 +9,14 @@ doc: doc_man doc_html
 doc_html: html-stamp
 
 html-stamp: grml-debootstrap.8.txt
-	sed -i 's/^include::releasetable-man.txt\[\]/include::releasetable.txt\[\]/' grml-debootstrap.8.txt
 	asciidoc -b xhtml11 -a icons grml-debootstrap.8.txt
 	touch html-stamp
 
 doc_man: man-stamp
 
 man-stamp: grml-debootstrap.8.txt
-	sed -i 's/^include::releasetable.txt\[\]/include::releasetable-man.txt\[\]/' grml-debootstrap.8.txt
 	asciidoc -d manpage -b docbook grml-debootstrap.8.txt
-	xsltproc --stringparam man.base.url.for.relative.links http://grml.org/grml-debootstrap/ \
+	xsltproc --nonet --stringparam man.base.url.for.relative.links https://grml.org/grml-debootstrap/ \
 		$(DOCBOOK_XML) grml-debootstrap.8.xml
 	touch man-stamp
 
@@ -35,31 +32,23 @@ shellcheck:
 		bash -n $${SCRIPT} || exit ; \
 		echo -n "."; \
 	done; \
-	for SCRIPT in $(MKSH_SCRIPTS) ; do \
-		test -r $${SCRIPT} || continue ; \
-		mksh -n $${SCRIPT} || exit ; \
-		echo -n "."; \
-	done; \
 	echo " done."
 
 install:
 	mkdir -p $(DESTDIR)/etc/debootstrap/
 	mkdir -p $(DESTDIR)/etc/debootstrap/extrapackages
 	mkdir -p $(DESTDIR)/usr/sbin/
-	mkdir -p $(DESTDIR)/etc/zsh/completion.d/
-	mkdir -p $(DESTDIR)/usr/share/grml-debootstrap/functions/
+	mkdir -p $(DESTDIR)/usr/share/zsh/vendor-completions
 	install -m 644 config           $(DESTDIR)/etc/debootstrap/
 	install -m 644 devices.tar.gz   $(DESTDIR)/etc/debootstrap/
 	install -m 644 locale.gen       $(DESTDIR)/etc/debootstrap/
 	install -m 644 packages         $(DESTDIR)/etc/debootstrap/
 	install -m 755 chroot-script    $(DESTDIR)/etc/debootstrap/
 	install -m 755 grml-debootstrap $(DESTDIR)/usr/sbin/
-	install -m 644 zsh-completion   $(DESTDIR)/etc/zsh/completion.d/_grml-debootstrap
-	install -m 644 cmdlineopts.clp  $(DESTDIR)/usr/share/grml-debootstrap/functions/cmdlineopts.clp
-	install -m 755 bootgrub.mksh    $(DESTDIR)/usr/share/grml-debootstrap/bootgrub.mksh
+	install -m 644 zsh-completion   $(DESTDIR)/usr/share/zsh/vendor-completions/_grml-debootstrap
 
 clean:
-	rm -rf grml-debootstrap.8.html grml-debootstrap.8.xml grml-debootstrap.8 html-stamp man-stamp
+	rm -rf grml-debootstrap.8.html grml-debootstrap.8.xml grml-debootstrap.8 html-stamp man-stamp packer/local_dir/
 
 testrun:
 	cd ./packer && $(MAKE) compile && $(MAKE) jessie