summaryrefslogtreecommitdiff
path: root/packages/x11
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-10-04 21:36:34 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-10-04 21:36:34 +0200
commitc244e79c9db5c3a87feb645cf64ec974bf4c63ce (patch)
tree60671debebd42d7b90d1ed41222c2ac0819bfebc /packages/x11
parent02bd09eea9470d4817d5e13b6d73d3d34c2c7647 (diff)
downloadembtoolkit-c244e79c9db5c3a87feb645cf64ec974bf4c63ce.tar.gz
embtoolkit-c244e79c9db5c3a87feb645cf64ec974bf4c63ce.tar.bz2
embtoolkit-c244e79c9db5c3a87feb645cf64ec974bf4c63ce.tar.xz
Build system: replace SYSROOT -> embtk_sysroot
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/x11')
-rw-r--r--packages/x11/libx11/libx11.mk8
-rw-r--r--packages/x11/libxcb/libxcb.mk4
-rw-r--r--packages/x11/xcbutil/xcbutil.mk10
-rw-r--r--packages/x11/xf86inputevdev/xf86inputevdev.mk2
-rw-r--r--packages/x11/xf86videofbdev/xf86videofbdev.mk2
-rw-r--r--packages/x11/xkeyboardconfig/xkeyboardconfig.mk2
-rw-r--r--packages/x11/xserver/xserver.mk2
7 files changed, 15 insertions, 15 deletions
diff --git a/packages/x11/libx11/libx11.mk b/packages/x11/libx11/libx11.mk
index 05bd9e8..59416c5 100644
--- a/packages/x11/libx11/libx11.mk
+++ b/packages/x11/libx11/libx11.mk
@@ -57,14 +57,14 @@ define embtk_postinstall_libx11
$(MAKE) $(LIBX11_BUILD_DIR)/.patchlibtool
$(Q)-mkdir -p $(ROOTFS)/usr/share
$(Q)-mkdir -p $(ROOTFS)/usr/share/X11
- $(Q)-cp $(SYSROOT)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/
- $(Q)-cp $(SYSROOT)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/
+ $(Q)-cp $(embtk_sysroot)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/
+ $(Q)-cp $(embtk_sysroot)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/
endef
$(LIBX11_BUILD_DIR)/.patchlibtool:
- @LIBX11_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libX11-* -type f -name *.la`; \
+ @LIBX11_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/libX11-* -type f -name *.la`; \
for i in $$LIBX11_LT_FILES; \
do \
sed \
- -i "s; /usr/$(LIBDIR)/libX11.la ; $(SYSROOT)/usr/$(LIBDIR)/libX11.la ;" $$i; \
+ -i "s; /usr/$(LIBDIR)/libX11.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libX11.la ;" $$i; \
done
diff --git a/packages/x11/libxcb/libxcb.mk b/packages/x11/libxcb/libxcb.mk
index a5d1761..a26430f 100644
--- a/packages/x11/libxcb/libxcb.mk
+++ b/packages/x11/libxcb/libxcb.mk
@@ -48,10 +48,10 @@ endef
$(LIBXCB_BUILD_DIR)/.patchlibtool:
- $(Q)LIBXCB_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
+ $(Q)LIBXCB_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
for i in $$LIBXCB_LT_FILES; \
do \
sed \
- -i "s; /usr/$(LIBDIR)/libxcb.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb.la ;" $$i; \
+ -i "s; /usr/$(LIBDIR)/libxcb.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb.la ;" $$i; \
done
diff --git a/packages/x11/xcbutil/xcbutil.mk b/packages/x11/xcbutil/xcbutil.mk
index e23dffc..437b8db 100644
--- a/packages/x11/xcbutil/xcbutil.mk
+++ b/packages/x11/xcbutil/xcbutil.mk
@@ -52,16 +52,16 @@ define embtk_postinstall_xcbutil
endef
$(XCBUTIL_BUILD_DIR)/.patchlibtool:
- $(Q)XCBUTIL_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
+ $(Q)XCBUTIL_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
for i in $$XCBUTIL_LT_FILES; \
do \
sed \
- -i "s; /usr/$(LIBDIR)/libxcb-event.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb-event.la ;" $$i; \
+ -i "s; /usr/$(LIBDIR)/libxcb-event.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-event.la ;" $$i; \
sed \
- -i "s; /usr/$(LIBDIR)/libxcb-aux.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb-aux.la ;" $$i; \
+ -i "s; /usr/$(LIBDIR)/libxcb-aux.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-aux.la ;" $$i; \
sed \
- -i "s; /usr/$(LIBDIR)/libxcb-property.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb-property.la ;" $$i; \
+ -i "s; /usr/$(LIBDIR)/libxcb-property.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-property.la ;" $$i; \
sed \
- -i "s; /usr/$(LIBDIR)/libxcb-atom.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb-atom.la ;" $$i; \
+ -i "s; /usr/$(LIBDIR)/libxcb-atom.la ; $(embtk_sysroot)/usr/$(LIBDIR)/libxcb-atom.la ;" $$i; \
done
$(Q)touch $@
diff --git a/packages/x11/xf86inputevdev/xf86inputevdev.mk b/packages/x11/xf86inputevdev/xf86inputevdev.mk
index 1936680..1ad860b 100644
--- a/packages/x11/xf86inputevdev/xf86inputevdev.mk
+++ b/packages/x11/xf86inputevdev/xf86inputevdev.mk
@@ -40,5 +40,5 @@ XF86INPUTEVDEV_PKGCONFIGS = xorg-evdev.pc
XF86INPUTEVDEV_DEPS = xserver_install
define embtk_postinstall_xf86inputevdev
- $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
+ $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
endef
diff --git a/packages/x11/xf86videofbdev/xf86videofbdev.mk b/packages/x11/xf86videofbdev/xf86videofbdev.mk
index 749bcdd..9f5aaa7 100644
--- a/packages/x11/xf86videofbdev/xf86videofbdev.mk
+++ b/packages/x11/xf86videofbdev/xf86videofbdev.mk
@@ -40,5 +40,5 @@ XF86VIDEOFBDEV_PKGCONFIGS =
XF86VIDEOFBDEV_DEPS = xserver_install
define embtk_postinstall_xf86videofbdev
- $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
+ $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
endef
diff --git a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
index 82671e3..5ff0a35 100644
--- a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
+++ b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
@@ -36,5 +36,5 @@ XKEYBOARDCONFIG_DEPS := intltool_host_install xkbcomp_install
define embtk_postinstall_xkeyboardconfig
$(Q)-mkdir -p $(ROOTFS)/usr/share
$(Q)-mkdir -p $(ROOTFS)/usr/share/X11
- $(Q)-cp -R $(SYSROOT)/usr/share/X11/xkb $(ROOTFS)/usr/share/X11/
+ $(Q)-cp -R $(embtk_sysroot)/usr/share/X11/xkb $(ROOTFS)/usr/share/X11/
endef
diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk
index fe2936a..67098ac 100644
--- a/packages/x11/xserver/xserver.mk
+++ b/packages/x11/xserver/xserver.mk
@@ -82,5 +82,5 @@ XSERVER_CONFIGURE_OPTS += --disable-tslib
endif
define embtk_postinstall_xserver
- $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
+ $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
endef