From f50f8a7ddeb8f89ff189892afce8d3fabf135244 Mon Sep 17 00:00:00 2001
From: gdr-ftp <gdr-ftp>
Date: Fri, 19 Mar 1999 05:53:33 +0000
Subject: [PATCH] moved the definitions of CATREZ, INSTALL, and TMPDIR to
 <gno/paths.mk> since so many components depend on them

---
 binconst.mk          | 10 +---------
 build.tools/Makefile |  4 +---
 lib/const.mk         |  4 +---
 lib/lib.mk           |  6 +-----
 paths.mk             | 12 +++++++++++-
 sys/sim/Makefile     |  8 +-------
 6 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/binconst.mk b/binconst.mk
index 975412d..1f9ce8d 100644
--- a/binconst.mk
+++ b/binconst.mk
@@ -2,7 +2,7 @@
 # Compilation constants for utilities (directories ./bin, ./sbin,
 # ./usr.bin, ./usr.sbin).  These are not used when building the libraries.
 #
-# $Id: binconst.mk,v 1.11 1999/01/07 07:28:14 gdr-ftp Exp $
+# $Id: binconst.mk,v 1.12 1999/03/19 05:53:31 gdr-ftp Exp $
 #
 # Devin Reade, 1997.
 #
@@ -15,17 +15,9 @@ LDLIBS	+= $(LDADD:s,-l,-l/usr/lib/lib,)
 # WARNING:  You *must* use descu v1.0.4 or later for these builds.
 DESCU		= /usr/sbin/descu
 COPYFORK	= /usr/orca/bin/copyfork
-CATREZ		= /usr/bin/catrez
-INSTALL		= /usr/bin/install
 MACGEN		= 17/macgen
 MACGEN_FLAGS	+= -P
 
-# Temporary directory needed in some weird cases.
-.IMPORT .IGNORE: TMPDIR
-.IF $(TMPDIR) == $(NULL)
-TMPDIR		= 14
-.END
-
 # $(DESC_SRC) is the created source file for the describe(1) database.
 # DESC_DIR	= $(RELEASE_DIR)/usr/lib
 DESC_DIR	= $(SRC_DIR)/gno/doc/describe
diff --git a/build.tools/Makefile b/build.tools/Makefile
index a557d7f..0558f14 100644
--- a/build.tools/Makefile
+++ b/build.tools/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1 1998/12/22 15:57:32 gdr-ftp Exp $
+# $Id: Makefile,v 1.2 1999/03/19 05:53:32 gdr-ftp Exp $
 #
 
 .INCLUDE:	/src/gno/paths.mk
@@ -9,8 +9,6 @@
 # which makes our targets very simple.
 #
 
-INSTALL		= /usr/bin/install
-
 build:
 	@/bin/true
 
diff --git a/lib/const.mk b/lib/const.mk
index b465a6e..d99ad47 100644
--- a/lib/const.mk
+++ b/lib/const.mk
@@ -6,7 +6,7 @@
 #
 # Devin Reade, 1997
 #
-# $Id: const.mk,v 1.6 1998/02/09 08:43:58 taubert Exp $
+# $Id: const.mk,v 1.7 1999/03/19 05:53:33 gdr-ftp Exp $
 #
 # It is critical that 13/orcacdefs/defaults.h is set up correctly,
 # including #defines for __appleiigs__ and __GNO__.  For the purpose
@@ -19,8 +19,6 @@ INCLUDES +=
 ASFLAGS	 += -r
 CFLAGS   += -r -w $(DEFINES) $(INCLUDES)
 LDFLAGS	 +=
-INSTALL   = /usr/bin/install
-CATREZ	  = /usr/bin/catrez
 
 # Where libraries get installed.   Most libraries should go into the
 # USRLIBDIR; only "special" libraries belong in LIBDIR
diff --git a/lib/lib.mk b/lib/lib.mk
index 082343d..379c78e 100644
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -1,5 +1,5 @@
 #
-#	$Id: lib.mk,v 1.7 1998/12/22 16:11:42 gdr-ftp Exp $
+#	$Id: lib.mk,v 1.8 1999/03/19 05:53:33 gdr-ftp Exp $
 #
 
 .INCLUDE:	/src/gno/paths.mk
@@ -57,10 +57,6 @@ force: $(OBJS)
 	$(CC) -o $(OBJ_DIR)$*.o $(CFLAGS) -c $<
 
 # Implicit rule to handle Rez source on case sensitive Appleshare servers
-.IMPORT .IGNORE: TMPDIR
-.IF $(TMPDIR) == $(NULL)
-TMPDIR		= 14
-.END
 .IF $(APPLESHARE_CASE_SENSITIVE) != $(NULL)
 %.r : %.rez
 	$(INSTALL) $< $(TMPDIR)/$<
diff --git a/paths.mk b/paths.mk
index ccb5610..6b7b6ce 100644
--- a/paths.mk
+++ b/paths.mk
@@ -7,7 +7,7 @@
 #
 # Devin Reade, 1997
 #
-# $Id: paths.mk,v 1.10 1998/12/22 16:13:41 gdr-ftp Exp $
+# $Id: paths.mk,v 1.11 1999/03/19 05:53:31 gdr-ftp Exp $
 #
 
 # This one isn't really a path, but it affects the creation of path
@@ -73,3 +73,13 @@ ORCA_DIST	= /lang/orca
 # to avoid backward references during linking.
 
 ORCA_SRC	= /src/lib/orcalibs/Source
+
+# Paths to various programs
+CATREZ		= /usr/bin/catrez
+INSTALL		= /usr/bin/install
+
+# Temporary directory needed in some weird cases.
+.IMPORT .IGNORE: TMPDIR
+.IF $(TMPDIR) == $(NULL)
+TMPDIR		= 14
+.END
diff --git a/sys/sim/Makefile b/sys/sim/Makefile
index 40a6736..8b7975f 100644
--- a/sys/sim/Makefile
+++ b/sys/sim/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1999/02/08 05:53:37 gdr-ftp Exp $
+# $Id: Makefile,v 1.3 1999/03/19 05:53:33 gdr-ftp Exp $
 #
 
 .INCLUDE: /src/gno/paths.mk
@@ -35,12 +35,6 @@ install:
 
 # Implicit rule to handle Rez source on case sensitive Appleshare servers
 .IF $(APPLESHARE_CASE_SENSITIVE) != $(NULL)
-
-.IMPORT .IGNORE: TMPDIR
-.IF $(TMPDIR) == $(NULL)
-TMPDIR		= 14
-.END
-
 %.r : %.rez
 	$(INSTALL) $< $(TMPDIR)/$<
 	$(REZ) -o $@ -c $(REZFLAGS) $(TMPDIR)/$<