diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-07 12:34:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-07 12:34:57 +0200 |
| commit | d22b78be7b2b95ba028c6584e9ee5abb69a375cb (patch) | |
| tree | 039da0ef61265cda4512279d36aea46c4670a715 /scripts | |
| parent | 702e216210d58f1301c80d4e55af5d29f813eb19 (diff) | |
| parent | 2e2eee9052d2c487d7114818ca446c370dba7f49 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-pkgs.sh | 9 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 854712190..c3724740f 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -38,14 +38,15 @@ if [[ -n $ADK_PACKAGE_FIREFOX ]]; then NEED_LIBIDL="$NEED_LIBIDL firefox" fi -if [[ -n $ADK_PACKAGE_LIBUSB ]]; then - NEED_BISON="$NEED_BISON libusb" -fi - if [[ -n $ADK_COMPILE_HEIMDAL ]]; then NEED_BISON="$NEED_BISON heimdal-server" fi +if [[ -n $ADK_COMPILE_PCMCIAUTILS ]]; then + NEED_BISON="$NEED_BISON pcmciautils" + NEED_FLEX="$NEED_FLEX pcmciautils" +fi + if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config" fi diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 16887e3dd..6d12c80e6 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -192,9 +192,11 @@ fi if [[ ! -s /usr/include/ncurses.h ]]; then if [[ ! -s /usr/include/curses.h ]]; then - echo Install ncurses header files, please. - echo - out=1 + if [[ ! -s /usr/include/ncurses/ncurses.h ]]; then + echo Install ncurses header files, please. + echo + out=1 + fi fi fi |