diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2005-01-21 15:36:45 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2005-01-21 15:36:45 +0000 |
| commit | 7011c19a8c96a2f8fb7c04d61cb28cdc507584a6 (patch) | |
| tree | 22c0efaf2b6bb5b461389f9bac9542c7e3a5909a /x11-servers/xorg-server-snap/files/patch-Imake.rules | |
| parent | Now buildable on 4.x, still broken on >= 5.x. (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_11_0'.release/4.11.0
Diffstat (limited to 'x11-servers/xorg-server-snap/files/patch-Imake.rules')
| -rw-r--r-- | x11-servers/xorg-server-snap/files/patch-Imake.rules | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/x11-servers/xorg-server-snap/files/patch-Imake.rules b/x11-servers/xorg-server-snap/files/patch-Imake.rules deleted file mode 100644 index deea1cb886a6..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-Imake.rules +++ /dev/null @@ -1,67 +0,0 @@ ---- config/cf/Imake.rules.orig Mon Dec 9 15:00:42 2002 -+++ config/cf/Imake.rules Mon Oct 13 17:04:19 2003 -@@ -1406,7 +1406,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef RmanDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanDependency() /**/ - #else - #define RmanDependency() @@\ -@@ -1421,7 +1421,7 @@ - #endif /* RmanDependency */ - - #ifndef RmanCmdDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanCmdDependency /**/ - #else - #define RmanCmdDependency ProgramTargetName($(RMAN)) -@@ -1874,7 +1874,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef DependDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define DependDependency() /**/ - #else - #define DependDependency() @@\ -@@ -1969,7 +1969,7 @@ - * within the source tree. - */ - #ifndef ImakeDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define ImakeDependency(target) /**/ - #else - #define ImakeDependency(target) @@\ -@@ -2066,11 +2066,18 @@ - * ProjectUnsharedLibReferences - variables for unshared libraries - */ - #ifndef ProjectUnsharedLibReferences -+#if defined(UseInstalledLibraries) -+#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ -+Concat3(DEP,varname,LIB) = @@\ -+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ -+LintLibReferences(varname,libname,libsource) -+#else - #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ - Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\ - Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ - LintLibReferences(varname,libname,libsource) - #endif -+#endif - - /* - * ProjectUnsharedFontLibReferences - unshared font libraries -@@ -3126,6 +3133,9 @@ - - #ifdef UseInstalled - #define ImakeSubCmdHelper $(IMAKE_CMD) -+#elif defined(UseInstalledPrograms) -+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) |