diff options
Diffstat (limited to 'source/x/x11')
-rw-r--r-- | source/x/x11/build/xkeyboard-config | 2 | ||||
-rw-r--r-- | source/x/x11/configure/xkeyboard-config | 30 | ||||
-rw-r--r-- | source/x/x11/make/xkeyboard-config | 5 | ||||
-rw-r--r-- | source/x/x11/post-install/xkeyboard-config.post-install | 13 |
4 files changed, 26 insertions, 24 deletions
diff --git a/source/x/x11/build/xkeyboard-config b/source/x/x11/build/xkeyboard-config index d00491fd7..0cfbf0888 100644 --- a/source/x/x11/build/xkeyboard-config +++ b/source/x/x11/build/xkeyboard-config @@ -1 +1 @@ -1 +2 diff --git a/source/x/x11/configure/xkeyboard-config b/source/x/x11/configure/xkeyboard-config index a5e05d6b5..fc2a5f14e 100644 --- a/source/x/x11/configure/xkeyboard-config +++ b/source/x/x11/configure/xkeyboard-config @@ -1,13 +1,19 @@ -./configure \ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir build +cd build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --disable-static \ - --enable-xkbcomp-symlink \ - --enable-compat-rules \ - --with-xkb-base=/etc/X11/xkb \ - --with-xkb-rules-symlink=xfree86,xorg \ - --build=$ARCH-slackware-linux + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir /usr/libexec \ + --bindir /usr/bin \ + --sbindir /usr/sbin \ + --includedir /usr/include \ + --datadir /usr/share \ + --mandir /usr/man \ + --sysconfdir /etc \ + --localstatedir /var \ + --buildtype=release \ + -Dcompat-rules=true \ + -Dxorg-rules-symlinks=true \ + .. || exit 1 diff --git a/source/x/x11/make/xkeyboard-config b/source/x/x11/make/xkeyboard-config new file mode 100644 index 000000000..635ee83dc --- /dev/null +++ b/source/x/x11/make/xkeyboard-config @@ -0,0 +1,5 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. diff --git a/source/x/x11/post-install/xkeyboard-config.post-install b/source/x/x11/post-install/xkeyboard-config.post-install index 8446f0641..92c647239 100644 --- a/source/x/x11/post-install/xkeyboard-config.post-install +++ b/source/x/x11/post-install/xkeyboard-config.post-install @@ -1,11 +1,2 @@ -# Move things into /etc/X11 that are supposed to be there: -#mkdir -p $PKG/etc/X11 -#rm -rf $PKG/etc/X11/xkb -#mv $PKG/usr/share/X11/xkb $PKG/etc/X11 -mkdir -p $PKG/usr/share/X11 -( cd $PKG/usr/share/X11 ; ln -sf ../../../etc/X11/xkb . ) -#( cd $PKG/etc/X11/xkb/rules -# ln -sf base.lst xorg.lst -# ln -sf base.xml xorg.xml -# ln -sf base xorg -#) +mkdir -p $PKG/etc/X11 +( cd $PKG/etc/X11 ; ln -sf ../../usr/share/X11/xkb . ) |