mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

51 lines
1.8 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/avm/nx-X11/installinopt.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -ruN nx-X11/config/cf/site.def nx-X11-new/config/cf/site.def
  20. --- nx-X11/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100
  21. +++ nx-X11-new/config/cf/site.def 2004-03-25 13:12:17.926673776 +0100
  22. @@ -72,23 +72,25 @@
  23. #ifdef AfterVendorCF
  24. #ifndef ProjectRoot
  25. -#define ProjectRoot /usr/X11R6
  26. +#define ProjectRoot /opt/nx
  27. #endif
  28. /*
  29. * On some platforms, some things may be installed outside of ProjectRoot
  30. * by default. To disable this, uncomment the following line.
  31. *
  32. -#define NothingOutsideProjectRoot YES
  33. */
  34. +#define NothingOutsideProjectRoot YES
  35. +#define FontconfigFontsConfDir ProjectRoot/etc/fonts
  36. +#define LinkGLToUsrInclude NO
  37. /*
  38. * Set EtcX11Directory if you want config file links installed under
  39. * ProjectRoot rather than in /etc/X11. See also HasVarDirectory,
  40. * UseEtcX11 and UseSeparateConfDir.
  41. *
  42. -#define EtcX11Directory ProjectRoot/etc
  43. */
  44. +#define EtcX11Directory ProjectRoot/etc
  45. /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */