$NetBSD: patch-ai,v 1.7 2023/02/22 07:44:55 wiz Exp $

--- Imake.tmpl.orig	2023-02-22 02:28:43.000000000 +0000
+++ Imake.tmpl
@@ -898,24 +898,18 @@ TCLIBDIR = TclLibDir
 #ifndef ManPath
 #define ManPath ManDirectoryRoot
 #endif
-#ifndef ManSourcePath
+#undef ManSourcePath
 #define ManSourcePath $(MANPATH)/man
-#endif
-#ifndef ManDir
+#undef ManDir
 #define ManDir $(MANSOURCEPATH)$(MANSUFFIX)
-#endif
-#ifndef LibmanDir
+#undef LibmanDir
 #define LibmanDir $(MANSOURCEPATH)$(LIBMANSUFFIX)
-#endif
-#ifndef FileManDir
+#undef FileManDir
 #define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX)
-#endif
-#ifndef MiscManDir
+#undef MiscManDir
 #define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX)
-#endif
-#ifndef DriverManDir
+#undef DriverManDir
 #define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX)
-#endif
 #ifndef AppLoadDefs
 #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
 #endif
@@ -1085,14 +1079,14 @@ TCLIBDIR = TclLibDir
 #endif
 #endif
 #ifndef ArAddCmd
-#if HasLargeTmp || SystemV4
+#if HasLargeTmp || SystemV4 || HasGnuAr
 #define ArAddCmd ArCmdBase ru
 #else
 #define ArAddCmd ArCmdBase rul
 #endif
 #endif
 #ifndef ArExtCmd
-#if HasLargeTmp || SystemV4
+#if HasLargeTmp || SystemV4 || HasGnuAr
 #define ArExtCmd ArCmdBase x
 #else
 #define ArExtCmd ArCmdBase xl
@@ -1447,9 +1441,9 @@ TCLIBDIR = TclLibDir
 #ifndef DependCmd
 #if UseGccMakeDepend
 #ifdef UseInstalled		/* assume BINDIR in path */
-#define DependCmd gccmakedep
+#define DependCmd ccmakedep
 #else
-#define DependCmd $(DEPENDSRC)/gccmakedep
+#define DependCmd $(DEPENDSRC)/ccmakedep
 #endif
 #elif UseCCMakeDepend
 #ifdef UseInstalled		/* assume BINDIR in path */
@@ -1609,40 +1603,18 @@ TCLIBDIR = TclLibDir
 #ifndef SHsuf
 #define SHsuf sh
 #endif
-#ifndef ManSuffix
-#define ManSuffix	n		/* use just one tab or cpp will die */
-#endif
-#ifndef LibManSuffix
+#undef ManSuffix
+#define ManSuffix	1		/* use just one tab or cpp will die */
+#undef LibManSuffix
 #define LibManSuffix	3		/* use just one tab or cpp will die */
-#endif
-#ifndef FileManSuffix
-#if SystemV || SystemV4 || defined(OSF1Architecture)
-#define FileManSuffix	4		/* use just one tab or cpp will die */
-#else
+#undef FileManSuffix
 #define FileManSuffix	5		/* use just one tab or cpp will die */
-#endif
-#endif
-#ifndef MiscManSuffix
-#if SystemV || SystemV4 || defined(OSF1Architecture)
-#define MiscManSuffix	5		/* use just one tab or cpp will die */
-#else
+#undef MiscManSuffix
 #define MiscManSuffix	7		/* use just one tab or cpp will die */
-#endif
-#endif
-#ifndef DriverManSuffix
-#if SystemV || SystemV4 || defined(OSF1Architecture)
-#define DriverManSuffix	7		/* use just one tab or cpp will die */
-#else
+#undef DriverManSuffix
 #define DriverManSuffix	4		/* use just one tab or cpp will die */
-#endif
-#endif
-#ifndef AdminManSuffix
-#if SystemV || SystemV4
-#define AdminManSuffix	1m		/* use just one tab or cpp will die */
-#else
+#undef AdminManSuffix
 #define AdminManSuffix	8		/* use just one tab or cpp will die */
-#endif
-#endif
 #ifndef ExpandManNames
 #if SystemV
 #define ExpandManNames NO
@@ -2049,6 +2021,10 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
      INSTDATFLAGS = InstDatFlags	/* install flags for data files */
     INSTKMEMFLAGS = InstKmemFlags	/* install flags for /dev/kmem progs */
 
+#ifdef RealProjectRoot
+REALPROJECTROOT = RealProjectRoot
+#endif
+
 #ifdef ProjectRoot
       PROJECTROOT = ProjectRoot
 #endif