mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 01:38:07 -04:00
107 lines
2.9 KiB
Plaintext
107 lines
2.9 KiB
Plaintext
$NetBSD: patch-ai,v 1.3 2012/04/12 14:01:17 hans Exp $
|
|
|
|
--- Imake.tmpl.orig 2009-10-16 21:45:42.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
|
|
@@ -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
|