From e343db7e837265b46c8b3c23d3585700fd5614b0 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 15 May 2002 18:43:55 +0000 Subject: [PATCH] $(TOPDIR), make, tmpl/tex: Kick out TOPDIR definition --- Makefile | 1 - make/Makefile | 1 - make/defs-orig.mk | 4 ++-- tmpl/tex/Makefile | 1 - tmpl/tex/de_contract/Makefile | 1 - tmpl/tex/de_technical/Makefile | 1 - tmpl/tex/en_technical/Makefile | 1 - 7 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 75b39bf1..299fc568 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ MODDIR=. -TOPDIR=. CLEAN = include lib SUBDIRS = $(shell find . -type d -maxdepth 1 | grep -ve "include\|CVS\|lib\|nomake" | grep /) include $(MODDIR)/make/dirs.mk diff --git a/make/Makefile b/make/Makefile index 104ee28a..aee0cf0f 100644 --- a/make/Makefile +++ b/make/Makefile @@ -4,5 +4,4 @@ # $Id$ MODDIR = .. -TOPDIR = .. include $(MODDIR)/make/text.mk diff --git a/make/defs-orig.mk b/make/defs-orig.mk index 74a2b552..15719581 100644 --- a/make/defs-orig.mk +++ b/make/defs-orig.mk @@ -11,8 +11,8 @@ else LIBNAME := $(PROJECT) endif -ifndef MODDIR - MODDIR := $(TOPDIR) +ifndef TOPDIR + TOPDIR := $(MODDIR) endif VERSION = $(shell cat $(TOPDIR)/VERSION) diff --git a/tmpl/tex/Makefile b/tmpl/tex/Makefile index 450d051d..f1503104 100644 --- a/tmpl/tex/Makefile +++ b/tmpl/tex/Makefile @@ -1,4 +1,3 @@ MODDIR=.. -TOPDIR=.. SUBDIRS = $(shell find . -type d -maxdepth 1 | grep -ve "CVS\|nomake" | grep /) include $(MODDIR)/make/dirs.mk diff --git a/tmpl/tex/de_contract/Makefile b/tmpl/tex/de_contract/Makefile index a3b667b4..4688e7bc 100644 --- a/tmpl/tex/de_contract/Makefile +++ b/tmpl/tex/de_contract/Makefile @@ -3,6 +3,5 @@ # $Id$ MODDIR = ../.. -TOPDIR = ../.. include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/de_technical/Makefile b/tmpl/tex/de_technical/Makefile index a3b667b4..4688e7bc 100644 --- a/tmpl/tex/de_technical/Makefile +++ b/tmpl/tex/de_technical/Makefile @@ -3,6 +3,5 @@ # $Id$ MODDIR = ../.. -TOPDIR = ../.. include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/en_technical/Makefile b/tmpl/tex/en_technical/Makefile index a3b667b4..4688e7bc 100644 --- a/tmpl/tex/en_technical/Makefile +++ b/tmpl/tex/en_technical/Makefile @@ -3,6 +3,5 @@ # $Id$ MODDIR = ../.. -TOPDIR = ../.. include $(MODDIR)/make/text.mk