i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install_fonts isn't useful anymore

Browse Source 
fonts are now installed as part of other data files
we still install some host fonts if found


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13557 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2005-07-08 12:35:07 +00:00
parent 6f1735a73a
commit 7e79718c2b
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makehdimage
+6 -13
View File
@@ -381,6 +381,12 @@ $cp ${sPrefix}data/system/boot/Bootscript \
${sPrefix}data/system/boot/SetupEnvironment \ ${sPrefix}data/system/boot/SetupEnvironment \
${sPrefix}data/system/boot/Netscript $targetDir/beos/system/boot/ ${sPrefix}data/system/boot/Netscript $targetDir/beos/system/boot/
$cp ${sPrefix}data/etc/profile ${sPrefix}data/etc/termcap $targetDir/beos/etc/ $cp ${sPrefix}data/etc/profile ${sPrefix}data/etc/termcap $targetDir/beos/etc/
$cp -r ${sPrefix}data/etc/fonts $targetDir/beos/etc/
if [ -e /boot/beos/etc/fonts/ttfonts/Swiss721.ttf ]; then
$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Courier10Pitch.ttf $targetDir/beos/etc/fonts/ttfonts/
$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721_Bold.ttf $targetDir/beos/etc/fonts/ttfonts/
$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721.ttf $targetDir/beos/etc/fonts/ttfonts/
fi
$cp ${sPrefix}src/tests/kernel/boot_floppy/fortune/fortunes $targetDir/beos/etc/ $cp ${sPrefix}src/tests/kernel/boot_floppy/fortune/fortunes $targetDir/beos/etc/
$cp -r ${sPrefix}distro/${arch}.R1/beos/etc $targetDir/beos/ $cp -r ${sPrefix}distro/${arch}.R1/beos/etc $targetDir/beos/
@@ -503,19 +509,6 @@ for f in $BEOS_NETWORK_PROTOCOLS; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network/protocols $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network/protocols
done done
# install fonts
echo "Installing fonts..."
cd $sourceDir/distro/${arch}.R1/beos/etc/
$cd ${sPrefix}$sourceDir/distro/${arch}.R1/beos/etc/
$cp -r ${sPrefix}fonts $targetDir/beos/etc/
if [ -e /boot/beos/etc/fonts/ttfonts/Swiss721.ttf ]; then
$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Courier10Pitch.ttf $targetDir/beos/etc/fonts/ttfonts/
$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721_Bold.ttf $targetDir/beos/etc/fonts/ttfonts/
$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721.ttf $targetDir/beos/etc/fonts/ttfonts/
fi
# install MIME database # install MIME database
mimeDBSource=$sourceDir/src/data/beos_mime mimeDBSource=$sourceDir/src/data/beos_mime
mimeDBDest=$targetDir/home/config/settings/beos_mime mimeDBDest=$targetDir/home/config/settings/beos_mime
src/servers/app/Jamfile
-3
View File
@@ -1,7 +1,5 @@
SubDir OBOS_TOP src servers app ; SubDir OBOS_TOP src servers app ;
Depends app_server : install_fonts ;
AddResources app_server : app_server.rdef ; AddResources app_server : app_server.rdef ;
UseLibraryHeaders agg png zlib ; UseLibraryHeaders agg png zlib ;
@@ -132,5 +130,4 @@ if $(TARGET_PLATFORM) = haiku {
libagg.a libfreetype.so textencoding ; libagg.a libfreetype.so textencoding ;
} }
SubInclude OBOS_TOP src servers app fonts ;
SubInclude OBOS_TOP src servers app drawing Painter ; SubInclude OBOS_TOP src servers app drawing Painter ;