Merge branch 'master' of github.com:dbosk/makefiles

dbosk · Jan 7, 2017 · b91c20d · b91c20d
2 parents 767958e + 73bcfb9
commit b91c20d
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 138 deletions.
diff --git a/depend.mk b/depend.mk
@@ -19,7 +19,7 @@ dvips:
 	which dvips || sudo pkg_add ghostscript
 else
 dvips:
-	which dvips || sudo apt-get install texlive-full
+	which dvips || sudo apt install texlive-full
 endif
 
 .PHONY: pdf2ps
@@ -28,7 +28,7 @@ pdf2ps:
 	which pdf2ps || sudo pkg_add ghostscript
 else
 pdf2ps:
-	which pdf2ps || sudo apt-get install texlive-full
+	which pdf2ps || sudo apt install texlive-full
 endif
 
 .PHONY: latex
@@ -37,7 +37,7 @@ latex:
 	which latex || sudo pkg_add texlive_texmf-full
 else
 latex:
-	which latex || sudo apt-get install texlive-full
+	which latex || sudo apt install texlive-full
 endif
 
 .PHONY: latexmk
@@ -46,7 +46,7 @@ latexmk:
 	which latexmk || sudo pkg_add latexmk
 else
 latexmk:
-	which latexmk || sudo apt-get install latexmk
+	which latexmk || sudo apt install latexmk
 endif
 
 .PHONY: pax
@@ -55,7 +55,7 @@ pax:
 	which pax
 else
 pax:
-	which pax || sudo apt-get install pax
+	which pax || sudo apt install pax
 endif
 
 .PHONY: sed
@@ -86,7 +86,7 @@ git:
 	which git || sudo pkg_add git git-svn
 else
 git:
-	which git || sudo apt-get install git git-svn
+	which git || sudo apt install git git-svn
 endif
 
 .PHONY: wget
@@ -95,7 +95,7 @@ wget:
 	which wget || sudo pkg_add wget
 else
 wget:
-	which wget || sudo apt-get install wget
+	which wget || sudo apt install wget
 endif
 
 .PHONY: localc
@@ -104,7 +104,7 @@ localc:
 	which localc || sudo pkg_add libreoffice
 else
 localc:
-	which localc || sudo apt-get install libreoffice
+	which localc || sudo apt install libreoffice
 endif
 
 .PHONY: soffice
@@ -113,7 +113,7 @@ soffice:
 	which soffice || sudo pkg_add libreoffice
 else
 soffice:
-	which soffice || sudo apt-get install libreoffice
+	which soffice || sudo apt install libreoffice
 endif
 
 .PHONY: dia
@@ -122,7 +122,7 @@ dia:
 	which dia || sudo pkg_add dia
 else
 dia:
-	which dia || sudo apt-get install dia
+	which dia || sudo apt install dia
 endif
 
 .PHONY: inkscape
@@ -131,7 +131,7 @@ inkscape:
 	which inkscape || sudo pkg_add inkscape 
 else
 inkscape:
-	which inkscape || sudo apt-get install inkscape
+	which inkscape || sudo apt install inkscape
 endif
 
 .PHONY: noweb
@@ -140,7 +140,16 @@ noweb:
 	which noweb || sudo pkg_add noweb 
 else
 noweb:
-	which noweb || sudo apt-get install noweb
+	which noweb || sudo apt install noweb
+endif
+
+.PHONY: pandoc
+ifeq (${MAKE},gmake)
+pandoc:
+	which pandoc || sudo pkg_add pandoc
+else
+pandoc:
+	which pandoc || sudo apt install pandoc
 endif
 
 

diff --git a/haskell.mk b/haskell.mk
@@ -0,0 +1,3 @@
+.SUFFIXES: .hs
+.hs.o:
+	ghc -c $<
diff --git a/latexmkrc b/latexmkrc
@@ -18,7 +18,7 @@ sub pythontex {
     # side effects in creating other files.  The dependence is a way
     # of triggering the rule to be run whenever the .pytxcode file
     # changes, and to do this before running latex/pdflatex again.
-    return system("pythontex --verbose --interpreter python:python3 \"$_[0]\"") ;
+    return system("pythontex --verbose --interpreter python:python3 \"$_[0]\"");
 }
 
 

diff --git a/miun.depend.mk b/miun.depend.mk
@@ -7,6 +7,8 @@ MIUN_DEPEND_MK=true
 CONF?= 	/etc/mk.conf
 -include ${CONF}
 
+CURRENT_URL=https://github.com/dbosk/miuntex/releases/download/v1.0
+
 
 .PHONY: clean-depends
 
@@ -25,21 +27,17 @@ ${miunmisc-depend} ${logo-depend}:
 
 MIUNMISC_FILES= 	MU_logotyp_int_CMYK.eps MU_logotyp_int_CMYK.pdf
 MIUNMISC_FILES+= 	MU_logotyp_int_sv.eps MU_logotyp_int_sv.pdf
-MIUNMISC_FILES+= 	miunmisc.ins miunmisc.dtx
+MIUNMISC_FILES+= 	miunmisc.sty miunmisc-Swedish.dict miunmisc-English.dict
 
 ifdef INCLUDE_MIUNTEX
 $(foreach f,${MIUNMISC_FILES},$(eval $f: ${INCLUDE_MIUNTEX}/miunmisc/$f))
 ${MIUNMISC_FILES}:
 	ln -s $^ $@
 else
 ${MIUNMISC_FILES}:
-	wget -O $@ http://ver.miun.se/latex/miunmisc/$@
+	wget -O $@ ${CURRENT_URL}/$@
 endif
 
-miunmisc.pdf miunmisc.ps: miunmisc.dtx
-miunmisc.sty miunmisc-Swedish.dict miunmisc-English.dict: miunmisc.ins
-miunmisc.sty miunmisc-Swedish.dict miunmisc-English.dict: miunmisc.dtx
-
 .PHONY: miunmisc miunlogo
 miunlogo: MU_logotyp_int_CMYK.eps MU_logotyp_int_CMYK.pdf
 miunlogo: MU_logotyp_int_sv.eps MU_logotyp_int_sv.pdf
@@ -74,7 +72,7 @@ ${MIUNART_FILES}:
 	ln -s $^ $@
 else
 ${MIUNART_FILES}:
-	wget -O $@ http://ver.miun.se/latex/miunart/$@
+	wget -O $@ ${CURRENT_URL}/$@
 endif
 
 .PHONY: miunart
@@ -103,7 +101,7 @@ ${MIUNASGN_FILES}:
 	ln -s $^ $@
 else
 ${MIUNASGN_FILES}:
-	wget -O $@ http://ver.miun.se/latex/miunasgn/$@
+	wget -O $@ ${CURRENT_URL}/$@
 endif
 
 .PHONY: miunasgn
@@ -132,7 +130,7 @@ ${MIUNEXAM_FILES}:
 	ln -s $^ $@
 else
 ${MIUNEXAM_FILES}:
-	wget -O $@ http://ver.miun.se/latex/miunexam/$@
+	wget -O $@ ${CURRENT_URL}/$@
 endif
 
 .PHONY: miunexam
@@ -154,7 +152,7 @@ ${miunlett-depend}:
 	cd /tmp/miunlett && ${MAKE} install
 
 miunlett.cls:
-	wget -O $@ http://ver.miun.se/latex/miunlett/$@
+	wget -O $@ ${CURRENT_URL}/$@
 
 .PHONY: miunlett
 miunlett: miunlett.cls miunlogo
@@ -182,7 +180,7 @@ ${MIUNPROT_FILES}:
 	ln -s $^ $@
 else
 ${MIUNPROT_FILES}:
-	wget -O $@ http://ver.miun.se/latex/miunprot/$@
+	wget -O $@ ${CURRENT_URL}/$@
 endif
 
 .PHONY: miunprot
@@ -211,7 +209,7 @@ ${MIUNTHES_FILES}:
 	ln -s $^ $@
 else
 ${MIUNTHES_FILES}:
-	wget -O $@ http://ver.miun.se/latex/miunthes/$@
+	wget -O $@ ${CURRENT_URL}/$@
 endif
 
 .PHONY: miunthes