diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-07 15:01:43 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-07 15:01:43 +0000 |
| commit | d56a2311e05cc65207942802bf54c47c2b92a86d (patch) | |
| tree | 5b16a1f4aeb80b7171b3c82eb6ae195590d5c9f9 | |
| parent | 4d0984d0c1e07bccacd979cfbfac28dcb5683ff1 (diff) | |
matchbox-panel: Test GUI_MACHINE_CLASS using base_conditional(), instead of
double indirection trick, should be more robust and fix issues seen.
| -rw-r--r-- | packages/matchbox-panel/matchbox-panel.inc | 7 | ||||
| -rw-r--r-- | packages/matchbox-panel/matchbox-panel_0.9.3.bb | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc index b2148a91bd..d81d38b285 100644 --- a/packages/matchbox-panel/matchbox-panel.inc +++ b/packages/matchbox-panel/matchbox-panel.inc @@ -3,17 +3,14 @@ LICENSE = "GPL" DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools" SECTION = "x11/wm" -PR = "r2" +PR = "r3" inherit autotools pkgconfig gettext CFLAGS += "-D_GNU_SOURCE" -CONF_bigscreen = "" -CONF_smallscreen = " --enable-small-icons " - EXTRA_OECONF = " --enable-startup-notification --enable-dnotify " -EXTRA_OECONF_append = ${CONF_${GUI_MACHINE_CLASS}} +EXTRA_OECONF_append = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "", " --enable-small-icons ", d)}' PACKAGE_ARCH = "${MACHINE}" FILES_${PN} = "${bindir}/* \ diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb index 2add352c6b..bed04323a7 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.3.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb @@ -1,4 +1,4 @@ require matchbox-panel.inc -PR="r1" +PR="r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://mb-applet-battery-repaint-093.patch;patch=1" |