From 2a44d42f9d3ca5f1fd0c6d9bc676581e9b38c1a3 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 2 May 2009 15:39:49 +0000 Subject: [PATCH] * now that it builds for gcc4 and gcc2, added locale kit back to image git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30573 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 43f33ea283..9a3f3d70b1 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -29,9 +29,10 @@ if $(HAIKU_ATA_STACK) = 1 { SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear - clockconfig cmp comm compress copyattr CortexAddOnHost cp + clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname - draggers driveinfo dstcheck du echo eject env error expand expr + draggers driveinfo dstcheck du dumpcatalog + echo eject env error expand expr factor false fdinfo ffm filepanel find finddir fmt fold fortune frcode ftp ftpd funzip fwcontrol @@ -39,7 +40,8 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 id ident ideinfo idestatus ifconfig install installsound iroster isvolume join - keymap kill less lessecho lesskey link listarea listattr listimage listdev + keymap kill less lessecho lesskey link linkcatkeys listarea listattr + listimage listdev listport listres listsem listusb ln locate logger login logname ls lsindex makebootable md5sum merge mimeset mkdos mkdir mkfifo mkfs mkindex modifiers mount mount_nfs mountvolume mv @@ -68,8 +70,8 @@ SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProb StyledEdit Terminal TextSearch TV Workspaces ; SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations E-mail - FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen - ScreenSaver Sounds Time Touchpad Tracker VirtualMemory + FileTypes Fonts Keyboard Keymap Locale Media Menu Mouse Network Printers + Screen ScreenSaver Sounds Time Touchpad Tracker VirtualMemory ; SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo GLDirectMode GLTeapot Mandelbrot Pairs @@ -80,7 +82,7 @@ SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so libdevice.so libgame.so libscreensaver.so libroot.so libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so - libilmimf.so libiconv.so + libilmimf.so libiconv.so liblocale.so ; SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server net_server media_addon_server input_server app_server fake_app_server @@ -346,6 +348,11 @@ SEARCH on $(spellFiles) = [ FDirName $(HAIKU_TOP) src apps mail ] ; AddFilesToHaikuImage system etc word_dictionary : $(spellFiles) ; +# Locale kit language files +local languageDir = [ FDirName $(HAIKU_TOP) src data etc locale languages ] ; +local languages = [ Glob $(languageDir) : *.language ] ; +AddFilesToHaikuImage system etc locale languages : $(languages) ; + local etcFiles = bash_completion inputrc profile teapot.data ; etcFiles = $(etcFiles:G=etc) ; SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;