diff options
| author | branden <branden> | 2005-03-06 01:05:00 +0000 |
|---|---|---|
| committer | branden <branden> | 2005-03-06 01:05:00 +0000 |
| commit | 60bb661b7f3f09bb601fb3d7a26b911219b6a26b (patch) | |
| tree | f3b2bb997e887affd42b6c42fc90c293b25d650c | |
| parent | 9058abf16ed4cb70103e3fed991a96f7ca464e37 (diff) | |
Shut up (tons of) Imake warnings on Debian systems by testing for variable
being defined before testing its value. (Presumably the fallback
definition of NothingOutsideProjectRoot in Imake.tmpl was intended to
prevent this, but it apparently is not in effect yet when linux.cf is
parsed.)
| -rw-r--r-- | linux.cf | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.22 2005/01/25 15:55:02 twini Exp $ +XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.23 2005/02/01 02:02:31 daniels Exp $ XCOMM platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ @@ -95,13 +95,13 @@ XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyV XCOMM binutils: (LinuxBinUtilsMajorVersion) #if LinuxDistribution == LinuxDebian -# if !NothingOutsideProjectRoot +# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot # define SystemManDirectory /usr/share/man # endif # define HasPam YES /* un-comment this when it is un-broken */ /* # define JoystickSupport YES */ -# if !NothingOutsideProjectRoot +# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot # define XAppLoadDir EtcX11Directory/app-defaults # define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S) /* the relative symlink created by this rule causes problems for us */ @@ -112,7 +112,7 @@ InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) # define InstallAppDefaultsLong(file,class) @@\ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) # endif /* InstallAppDefFiles */ -# endif /* !NothingOutsideProjectRoot */ +# endif /* !defined(NotingOutsideProjectRoot) || !NothingOutsideProjectRoot */ # define SharedLibXdmGreet NO # define LinkGLToUsrInclude NO # define LinkGLToUsrLib NO |