diff -ruN auto-multiple-choice-1.3.0.orig/Makefile.conf auto-multiple-choice-1.3.0/Makefile.conf --- auto-multiple-choice-1.3.0.orig/Makefile.conf 2016-03-09 20:17:01.000000000 +0100 +++ auto-multiple-choice-1.3.0/Makefile.conf 2017-01-21 21:55:32.649670839 +0100 @@ -33,13 +33,13 @@ # directory for executable BINDIR=/usr/bin # directory for perl modules -PERLDIR=/usr/share/perl5 +PERLDIR=$(VENDOR_LIB) # directory for some AMC executables, not to be used by end-user MODSDIR=/usr/lib/AMC # directory for LaTeX style file -TEXDIR=/usr/share/texmf/tex/latex/AMC +TEXDIR=/usr/share/texmf-site/tex/latex/AMC # directory for LaTeX doc -TEXDOCDIR=/usr/share/doc/texmf/AMC/ +TEXDOCDIR=/usr/share/texmf-site/doc/AMC/ # directory for man (1) files MAN1DIR=/usr/share/man/man1 # directory for desktop file @@ -54,7 +54,7 @@ # directory for AMC packaged models MODELSDIR=/usr/share/auto-multiple-choice/models # directory for documentation (will use html/auto-multiple-choice.* subdirs for HTML docs) -DOCDIR=/usr/share/doc/auto-multiple-choice-doc +DOCDIR=/usr/share/doc/$(PVR) # directory for Shared MIME-info Database SHARED_MIMEINFO_DIR=/usr/share/mime/packages @@ -91,8 +91,8 @@ # INSTALL USER AND GROUP -ifneq ($(SYSTEM_TYPE),rpm) -INSTALL_USER=root -INSTALL_GROUP=root -endif +#ifneq ($(SYSTEM_TYPE),rpm) +#INSTALL_USER=root +#INSTALL_GROUP=root +#endif diff -ruN auto-multiple-choice-1.3.0.orig/doc/Makefile auto-multiple-choice-1.3.0/doc/Makefile --- auto-multiple-choice-1.3.0.orig/doc/Makefile 2016-03-14 19:40:45.000000000 +0100 +++ auto-multiple-choice-1.3.0/doc/Makefile 2017-01-21 21:28:29.438603307 +0100 @@ -64,7 +64,7 @@ esac %.pdf: %.tex $(BLOCK_IMAGES:.svg=.pdf) - export TEXINPUTS=./img_pdf/: ; case $< in \ + export TEXINPUTS=$(TEXINPUTS):./img_pdf/: ; case $< in \ *.ja.tex) \ sed -i -e '/setuplocale/a\ \\usepackage{xeCJK}\