diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
| commit | 441c122606e3a921a947f4126a414c9974d64533 (patch) | |
| tree | a6ad7f810150142b2d0f2a51ee49a1ddbff285a5 /package/midori | |
| parent | 8c1fc169ab7330ddaed774d1e780b9d81edb4f25 (diff) | |
| parent | 74ecbaa23da486182a1bb20b43361aaf2a478877 (diff) | |
| download | buildroot-novena-441c122606e3a921a947f4126a414c9974d64533.tar.gz buildroot-novena-441c122606e3a921a947f4126a414c9974d64533.zip | |
Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/midori')
| -rw-r--r-- | package/midori/Config.in | 5 | ||||
| -rw-r--r-- | package/midori/midori.mk | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/package/midori/Config.in b/package/midori/Config.in index eb960d4eb..80b7f772d 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -2,11 +2,8 @@ config BR2_PACKAGE_MIDORI bool "midori" select BR2_PACKAGE_WEBKIT select BR2_PACKAGE_LIBSEXY - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XORG7 help Midori is a lightweight web browser based on WebKit http://software.twotoasts.de/?page=midori - -comment "midori - disabled (requires Xorg(7))" - depends on !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7) diff --git a/package/midori/midori.mk b/package/midori/midori.mk index 805b0287a..6861d4c29 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -11,6 +11,6 @@ MIDORI_AUTORECONF = YES MIDORI_INSTALL_STAGING = NO MIDORI_INSTALL_TARGET = YES -MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy $(XSERVER) +MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy xserver_xorg-server $(eval $(call AUTOTARGETS,package,midori)) |