From c244e79c9db5c3a87feb645cf64ec974bf4c63ce Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Thu, 4 Oct 2012 21:36:34 +0200 Subject: Build system: replace SYSROOT -> embtk_sysroot Signed-off-by: Abdoulaye Walsimou Gaye --- packages/misc/gettext/gettext.mk | 14 +++++++------- packages/misc/ncurses/ncurses.mk | 2 +- packages/misc/tslib/tslib.mk | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'packages/misc') diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk index 5ccdac6..f0c357d 100644 --- a/packages/misc/gettext/gettext.mk +++ b/packages/misc/gettext/gettext.mk @@ -47,7 +47,7 @@ GETTEXT_CONFIGURE_ENV := gl_cv_func_wcwidth_works=yes \ gt_cv_int_divbyzero_sigfpe=no GETTEXT_CONFIGURE_OPTS := --enable-relocatable --with-included-gettext \ --disable-rpath --disable-openmp --disable-java \ - --with-libxml2-prefix=$(SYSROOT)/usr \ + --with-libxml2-prefix=$(embtk_sysroot)/usr \ --disable-openmp GETTEXT_DEPS = ncurses_install libxml2_install @@ -61,13 +61,13 @@ endef #FIXME: this should be fixed in gettext project $(GETTEXT_BUILD_DIR)/.patchlibtool: $(Q)sed \ - -i "s;/usr/$(LIBDIR)/libintl.la;$(SYSROOT)/$(LIBDIR)/libintl.la;" \ - $(SYSROOT)/usr/$(LIBDIR)/libgettextlib.la \ - $(SYSROOT)/usr/$(LIBDIR)/libgettextpo.la \ - $(SYSROOT)/usr/$(LIBDIR)/libgettextsrc.la + -i "s;/usr/$(LIBDIR)/libintl.la;$(embtk_sysroot)/$(LIBDIR)/libintl.la;" \ + $(embtk_sysroot)/usr/$(LIBDIR)/libgettextlib.la \ + $(embtk_sysroot)/usr/$(LIBDIR)/libgettextpo.la \ + $(embtk_sysroot)/usr/$(LIBDIR)/libgettextsrc.la $(Q)sed \ - -i "s;/usr/$(LIBDIR)/libgettextlib.la;$(SYSROOT)/$(LIBDIR)/libgettextlib.la;" \ - $(SYSROOT)/usr/$(LIBDIR)/libgettextsrc.la + -i "s;/usr/$(LIBDIR)/libgettextlib.la;$(embtk_sysroot)/$(LIBDIR)/libgettextlib.la;" \ + $(embtk_sysroot)/usr/$(LIBDIR)/libgettextsrc.la @touch $@ # gettext for host development machine diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk index 20168e1..b941095 100644 --- a/packages/misc/ncurses/ncurses.mk +++ b/packages/misc/ncurses/ncurses.mk @@ -51,5 +51,5 @@ NCURSES_CONFIGURE_OPTS := --disable-rpath --without-cxx-binding \ define embtk_postinstall_ncurses $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)-cp -R $(SYSROOT)/usr/share/tabset $(ROOTFS)/usr/share/ + $(Q)-cp -R $(embtk_sysroot)/usr/share/tabset $(ROOTFS)/usr/share/ endef diff --git a/packages/misc/tslib/tslib.mk b/packages/misc/tslib/tslib.mk index b8727ad..4ee0aaf 100644 --- a/packages/misc/tslib/tslib.mk +++ b/packages/misc/tslib/tslib.mk @@ -40,5 +40,5 @@ TSLIB_PKGCONFIGS = tslib*.pc TSLIB_DEPS = define embtk_postinstall_tslib - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/ts $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/ts $(ROOTFS)/usr/$(LIBDIR)/ endef -- cgit v1.2.3