blob: 407ea771acc73d8b942f875aa1c9b7e2e1c4b828 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
--- config/cf/Imake.tmpl.orig Wed Oct 16 20:56:39 2002
+++ config/cf/Imake.tmpl Wed Oct 16 21:52:31 2002
@@ -220,7 +220,7 @@
#ifndef RmanCmd
#if BuildRman
-#ifdef UseInstalled /* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
#define RmanCmd rman
#else
#define RmanCmd $(TOP)/config/util/rman
@@ -1282,7 +1282,7 @@
#define LoaderLibPrefix /**/
#endif
#ifndef ImakeCmd
-#ifdef UseInstalled /* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
#define ImakeCmd imake
#else
#define ImakeCmd $(IMAKESRC)/imake
@@ -1290,19 +1290,19 @@
#endif
#ifndef DependCmd
#if UseGccMakeDepend
-#ifdef UseInstalled /* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
#define DependCmd gccmakedep
#else
#define DependCmd $(DEPENDSRC)/gccmakedep
#endif
#elif UseCCMakeDepend
-#ifdef UseInstalled /* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
#define DependCmd ccmakedep
#else
#define DependCmd $(DEPENDSRC)/ccmakedep
#endif
#else
-#ifdef UseInstalled /* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
#define DependCmd makedepend
#else
#define DependCmd $(DEPENDSRC)/makedepend
@@ -1329,21 +1329,21 @@
#ifndef ExportListCmd
# ifndef ExportListGenSource
# define ExportListCmd /**/
-# elif !defined(UseInstalled)
+# elif !defined(UseInstalled) && !defined(UseInstalledPrograms)
# define ExportListCmd $(CONFIGSRC)/util/exportlistgen
# else
# define ExportListCmd exportlistgen
# endif
#endif
#ifndef MkdirHierCmd
-#ifdef UseInstalled /* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
#define MkdirHierCmd mkdirhier
#else
#define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
#endif
#endif
#ifndef RevPathCmd
-#ifdef UseInstalled /* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
#define RevPathCmd revpath
#else
#define RevPathCmd $(CONFIGSRC)/util/revpath
|
