diff options
| author | Keith Packard <keithp@keithp.com> | 2004-08-07 01:05:32 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2004-08-07 01:05:32 +0000 |
| commit | 24b3872595d11c355ba7c8985c167e46b65b37a2 (patch) | |
| tree | a3cf188330c0cb7e93aea916caad110ff3338345 | |
| parent | ac9fdc98840b1aaeb0d9f5597531eb49cd177f56 (diff) | |
Fix Debian section to respect NothingOutsideProjectRoot directive
| -rw-r--r-- | linux.cf | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1,4 +1,4 @@ -XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.10 2004/07/28 03:24:29 gisburn Exp $ +XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.11 2004/08/02 19:35:07 eich Exp $ XCOMM platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ @@ -95,11 +95,14 @@ XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyV XCOMM binutils: (LinuxBinUtilsMajorVersion) #if LinuxDistribution == LinuxDebian -# define SystemManDirectory /usr/share/man +# if !NothingOutsideProjectRoot +# define SystemManDirectory /usr/share/man +# endif # define HasPam YES /* un-comment this when it is un-broken */ /* # define JoystickSupport YES */ -# define XAppLoadDir EtcX11Directory/app-defaults +# if !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 */ # if defined(InstallAppDefFiles) && InstallAppDefFiles @@ -109,6 +112,7 @@ InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) # define InstallAppDefaultsLong(file,class) @@\ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) # endif /* InstallAppDefFiles */ +# endif /* !NothingOutsideProjectRoot */ # define SharedLibXdmGreet NO # define LinkGLToUsrInclude NO # define LinkGLToUsrLib NO |