d0cc39f7c8
[2] Make the ports respect CFLAGS better. Now CFLAGS (and CC/CXX) are set for the build during the configure stage. PR: [2] 40271, 43369
68 lines
2.2 KiB
Text
68 lines
2.2 KiB
Text
--- 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
|