From 324da4762ad355bddc10d33bbb9456da5abd4cd3 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 7 Apr 2017 15:34:35 +0000 Subject: [PATCH] $(TOPDIR), make, tmpl/tex: Move texdoc to tmpl/tex Signed-off-by: Jan Lindemann --- Makefile | 2 +- make/tex.mk | 2 +- tmpl/tex/Makefile | 3 +-- tmpl/tex/de_contract/Makefile | 2 +- tmpl/tex/de_presentation/Makefile | 2 +- tmpl/tex/de_technical/Makefile | 2 +- tmpl/tex/en_technical/Makefile | 2 +- tmpl/tex/technical/Makefile | 3 ++- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 10746901..caf97bda 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ TOPDIR = . -SUBDIRS = make scripts bin htdocs texdoc tmpl conf +SUBDIRS = make scripts bin htdocs tmpl conf RPM_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@ftp.janware.com:/srv/ftp/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) include $(TOPDIR)/make/proj.mk diff --git a/make/tex.mk b/make/tex.mk index b973ec12..7c201b41 100644 --- a/make/tex.mk +++ b/make/tex.mk @@ -34,7 +34,7 @@ DOCUMENT_CLASS ?= article else DOCUMENT_CLASS ?= article endif -TEX_TMPL_BASE_DIR ?= $(MODDIR)/texdoc +TEX_TMPL_BASE_DIR ?= $(MODDIR)/tmpl/tex TEX_TMPL_STYLE ?= de_technical TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE) IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl) diff --git a/tmpl/tex/Makefile b/tmpl/tex/Makefile index 867368ff..a5f21879 100644 --- a/tmpl/tex/Makefile +++ b/tmpl/tex/Makefile @@ -1,5 +1,4 @@ -TOPDIR = .. -SUBDIRS = $(FIND_SUBDIRS) +TOPDIR = ../.. include $(TOPDIR)/make/proj.mk include $(MODDIR)/make/dirs.mk diff --git a/tmpl/tex/de_contract/Makefile b/tmpl/tex/de_contract/Makefile index c4978a6c..0b974bd6 100644 --- a/tmpl/tex/de_contract/Makefile +++ b/tmpl/tex/de_contract/Makefile @@ -2,7 +2,7 @@ # contact@jannet.de # $Id$ -TOPDIR = ../.. +TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/de_presentation/Makefile b/tmpl/tex/de_presentation/Makefile index c4978a6c..0b974bd6 100644 --- a/tmpl/tex/de_presentation/Makefile +++ b/tmpl/tex/de_presentation/Makefile @@ -2,7 +2,7 @@ # contact@jannet.de # $Id$ -TOPDIR = ../.. +TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/de_technical/Makefile b/tmpl/tex/de_technical/Makefile index c4978a6c..0b974bd6 100644 --- a/tmpl/tex/de_technical/Makefile +++ b/tmpl/tex/de_technical/Makefile @@ -2,7 +2,7 @@ # contact@jannet.de # $Id$ -TOPDIR = ../.. +TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/en_technical/Makefile b/tmpl/tex/en_technical/Makefile index c4978a6c..0b974bd6 100644 --- a/tmpl/tex/en_technical/Makefile +++ b/tmpl/tex/en_technical/Makefile @@ -2,7 +2,7 @@ # contact@jannet.de # $Id$ -TOPDIR = ../.. +TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/technical/Makefile b/tmpl/tex/technical/Makefile index 6195fd09..7a749e5b 100644 --- a/tmpl/tex/technical/Makefile +++ b/tmpl/tex/technical/Makefile @@ -1 +1,2 @@ -all clean install distclean profclean: +all: +clean install distclean profclean: