From 04446741647dce023766af5cdfe0ac6bdb563e0c Mon Sep 17 00:00:00 2001 From: Eugeniy Mikhailov Date: Thu, 16 Apr 2015 23:20:21 -0400 Subject: updated Makefiles to use dest_dirs.mk file capabilities --- lecture_subdir_makefile/Makefile | 7 +++++-- pic_source_dir/Makefile | 4 +++- pic_source_subdir/Makefile | 4 +++- quiz_subdir_makefile/Makefile | 7 +++++-- subdir_makefile/Makefile | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lecture_subdir_makefile/Makefile b/lecture_subdir_makefile/Makefile index 6e5933f..0980acf 100644 --- a/lecture_subdir_makefile/Makefile +++ b/lecture_subdir_makefile/Makefile @@ -4,16 +4,19 @@ TOPDIR ?= .. include ./local.mk include $(TOPDIR)/common.mk +dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR) + include $(MAKEINCLUDE_DIR)/t2t.mk +include $(MAKEINCLUDE_DIR)/pandoc.mk +include $(MAKEINCLUDE_DIR)/rem.mk include $(MAKEINCLUDE_DIR)/beamer_lecture.mk include $(MAKEINCLUDE_DIR)/tex.mk include $(MAKEINCLUDE_DIR)/css.mk include $(MAKEINCLUDE_DIR)/raw.mk include $(MAKEINCLUDE_DIR)/subdirs.mk +include $(MAKEINCLUDE_DIR)/dest_dirs.mk -dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR) - .DEFAULT_GOAL := all all: compile install diff --git a/pic_source_dir/Makefile b/pic_source_dir/Makefile index bb5e0d4..25ac012 100644 --- a/pic_source_dir/Makefile +++ b/pic_source_dir/Makefile @@ -5,6 +5,8 @@ TOPDIR ?= .. include ./local.mk include $(TOPDIR)/common.mk +dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR) + include $(MAKEINCLUDE_DIR)/pic_pdf_compatible.mk include $(MAKEINCLUDE_DIR)/eps.mk include $(MAKEINCLUDE_DIR)/pic_svg.mk @@ -12,8 +14,8 @@ include $(MAKEINCLUDE_DIR)/gnuplot_eps.mk include $(MAKEINCLUDE_DIR)/gnuplot_ltx_eps.mk include $(MAKEINCLUDE_DIR)/circuit_eps.mk include $(MAKEINCLUDE_DIR)/subdirs.mk +include $(MAKEINCLUDE_DIR)/dest_dirs.mk -dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR) .DEFAULT_GOAL := all diff --git a/pic_source_subdir/Makefile b/pic_source_subdir/Makefile index 7eb698d..14580d0 100644 --- a/pic_source_subdir/Makefile +++ b/pic_source_subdir/Makefile @@ -5,6 +5,8 @@ TOPDIR ?= .. include ./local.mk include $(TOPDIR)/common.mk +dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR) + include $(MAKEINCLUDE_DIR)/pic_pdf_compatible.mk include $(MAKEINCLUDE_DIR)/eps.mk include $(MAKEINCLUDE_DIR)/pic_svg.mk @@ -12,8 +14,8 @@ include $(MAKEINCLUDE_DIR)/gnuplot_eps.mk include $(MAKEINCLUDE_DIR)/gnuplot_ltx_eps.mk include $(MAKEINCLUDE_DIR)/circuit_eps.mk include $(MAKEINCLUDE_DIR)/subdirs.mk +include $(MAKEINCLUDE_DIR)/dest_dirs.mk -dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR) .DEFAULT_GOAL := all diff --git a/quiz_subdir_makefile/Makefile b/quiz_subdir_makefile/Makefile index 87585d5..387500c 100644 --- a/quiz_subdir_makefile/Makefile +++ b/quiz_subdir_makefile/Makefile @@ -4,17 +4,20 @@ TOPDIR ?= .. include ./local.mk include $(TOPDIR)/common.mk +dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR) + include $(MAKEINCLUDE_DIR)/t2t.mk +include $(MAKEINCLUDE_DIR)/pandoc.mk +include $(MAKEINCLUDE_DIR)/rem.mk #include $(MAKEINCLUDE_DIR)/beamer_lecture.mk include $(MAKEINCLUDE_DIR)/tex_auto.mk include $(MAKEINCLUDE_DIR)/tex.mk include $(MAKEINCLUDE_DIR)/css.mk include $(MAKEINCLUDE_DIR)/raw.mk include $(MAKEINCLUDE_DIR)/subdirs.mk +include $(MAKEINCLUDE_DIR)/dest_dirs.mk -dest_dir = $(DESTDIR)$(PREFIX)/$(PACKAGE_DIR) - .DEFAULT_GOAL := all all: compile install diff --git a/subdir_makefile/Makefile b/subdir_makefile/Makefile index d630067..0980acf 100644 --- a/subdir_makefile/Makefile +++ b/subdir_makefile/Makefile @@ -14,7 +14,7 @@ include $(MAKEINCLUDE_DIR)/tex.mk include $(MAKEINCLUDE_DIR)/css.mk include $(MAKEINCLUDE_DIR)/raw.mk include $(MAKEINCLUDE_DIR)/subdirs.mk - +include $(MAKEINCLUDE_DIR)/dest_dirs.mk .DEFAULT_GOAL := all -- cgit v1.2.3