Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 20 years ago
parent
commit
5fe1e9f8fa
2 changed files with 22 additions and 1 deletions
  1. +12
    -0
      package/xorg/util-macros/util-macros.conf
  2. +10
    -1
      package/xorg/xorg_config.sh

+ 12
- 0
package/xorg/util-macros/util-macros.conf

@ -1 +1,13 @@
. "$base/package/xorg/xorg_config.sh"
hook_add premake 5 xorg_premake
xorg_premake ()
{
mkdir -p $root/usr/X11R7
ln -svf X11R7 $root/usr/X11
# for Mesa3D
ln -svf X11R7 $root/usr/X11R6
# for gtk+ et al.
ln -svf ../X11/include/X11 $root/usr/include/X11
}

+ 10
- 1
package/xorg/xorg_config.sh

@ -4,8 +4,17 @@
prefix="$root/usr/X11R7"
set_confopt
if [[ "$xpkg" == font-* && "$xpkg" != font-util ]] ; then
xorg_fonts_preconf ()
{
# This prevents creation of fonts.scale and font.dir files.
sed -i -e's,\(.*$(MAKE).*install-data-hook\),#\1,' Makefile.in
}
hook_add preconf 5 xorg_fonts_preconf
fi
SUDO=""
DESTDIR=""
DESTDIR="$root/"
PREFIX="$prefix"
# Must create local aclocal dir or aclocal fails

Loading…
Cancel
Save