openmamba/makedist-openmamba-milestone3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate Makefiles from OpenOffice to libreoffice

Browse Source
This commit is contained in:
Silvan Calarco 2011-10-20 19:07:41 +02:00
parent f2801ec9a4
commit 0fd58279d7
7 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -57,15 +57,9 @@ aspell:
{ echo -n "$@ "; \ { echo -n "$@ "; \
[ ! "$(LANGUAGE)" = "" ] && echo -n "aspell-$(LANGUAGE) "; } || \ [ ! "$(LANGUAGE)" = "" ] && echo -n "aspell-$(LANGUAGE) "; } || \
: :
OpenOffice: libreoffice:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \ { echo -n "$@ "; \
[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && \ [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && \
echo -n "OpenOffice-i18n-$(LANGUAGE) "; } || \ echo -n "libreoffice-i18n-$(LANGUAGE) "; } || \
echo -n "OpenOffice-i18n-en " echo -n "libreoffice-i18n-en "
#OpenOffice-help:
# @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
# { echo -n "$@ "; \
# [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && \
# echo -n "OpenOffice-help-$(LANGUAGE) "; } || \
# echo -n "OpenOffice-help-en "

4
Makefile.defs
View File

@ -107,8 +107,8 @@ perl[Automake__XFile] = automake
libgs.so.9 = ghostscript libgs.so.9 = ghostscript
# openoffice # libreoffice
openofficei18n = OpenOffice-i18n-$(LANGUAGE) libreofficei18n = libreoffice-i18n-$(LANGUAGE)
# vpn # vpn
networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp

4
platforms/livecd-gnome-root/Makefile
View File

@ -14,7 +14,7 @@ $(MAKEDIST_TARGET)-livecd-gnome: \
desktop-base-gnome desktop-base-gnome
#kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok
$(MAKEDIST_TARGET)-livecd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
$(MAKEDIST_TARGET)-livecd-gnome-root: \ $(MAKEDIST_TARGET)-livecd-gnome-root: \
postplug-xorg postplug-sound \ postplug-xorg postplug-sound \
@ -35,5 +35,3 @@ $(MAKEDIST_TARGET)-livecd-gnome-root: \
$(MAKEDIST_TARGET)-livecd-root-en: $(MAKEDIST_TARGET)-livecd-root-en:
$(MAKEDIST_TARGET)-livecd-root-es: $(MAKEDIST_TARGET)-livecd-root-es:
$(MAKEDIST_TARGET)-livecd-root-it: $(MAKEDIST_TARGET)-livecd-root-it:
#OpenOffice-i18n-it

2
platforms/livecd-light-root/Makefile
View File

@ -9,7 +9,7 @@ $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted i
xorg-drv-input-mouse xorg-drv-input-void \ xorg-drv-input-mouse xorg-drv-input-void \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart chromium desktop-base-openmamba xorg-drv-input-tslib xcursor-transparent-theme rpm smart chromium desktop-base-openmamba
$(MAKEDIST_TARGET)-livecd-light-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress $(MAKEDIST_TARGET)-livecd-light-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
$(MAKEDIST_TARGET)-livecd-light-root: \ $(MAKEDIST_TARGET)-livecd-light-root: \
postplug-xorg postplug-sound \ postplug-xorg postplug-sound \

3
platforms/livecd-root/Makefile
View File

@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg
kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \ kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
kaffeine libqt4-sqlite kate kaffeine libqt4-sqlite kate
#kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok
$(MAKEDIST_TARGET)-livecd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress
$(MAKEDIST_TARGET)-livecd-root: \ $(MAKEDIST_TARGET)-livecd-root: \
postplug-xorg postplug-sound \ postplug-xorg postplug-sound \
@ -38,5 +38,4 @@ $(MAKEDIST_TARGET)-livecd-root-es: \
$(MAKEDIST_TARGET)-livecd-root-it: \ $(MAKEDIST_TARGET)-livecd-root-it: \
kde-l10n-it kde-l10n-it
# firefox-i18n-it # firefox-i18n-it
#OpenOffice-i18n-it
# FIXME: add kdepim # FIXME: add kdepim

5
platforms/livedvd-root/Makefile
View File

@ -8,7 +8,7 @@ $(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgp
kaffeine libqt4-sqlite kate kaffeine libqt4-sqlite kate
# knemo # knemo
#kitchensync4 #kitchensync4
$(MAKEDIST_TARGET)-livedvd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
$(MAKEDIST_TARGET)-livedvd-root: \ $(MAKEDIST_TARGET)-livedvd-root: \
postplug-xorg postplug-sound \ postplug-xorg postplug-sound \
@ -38,8 +38,7 @@ $(MAKEDIST_TARGET)-livedvd-root-es: \
# firefox-i18n-es-ES # firefox-i18n-es-ES
$(MAKEDIST_TARGET)-livedvd-root-it: \ $(MAKEDIST_TARGET)-livedvd-root-it: \
kde-l10n-it kde-l10n-it
# firefox-i18n-it # firefox-i18n-it
#OpenOffice-i18n-it
# FIXME: add kdepim # FIXME: add kdepim
syslog-ng: syslog-ng:
@echo @echo

3
platforms/testcd-root/Makefile
View File

@ -8,7 +8,7 @@ $(MAKEDIST_TARGET)-testcd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg
kaffeine libqt4-sqlite kate kaffeine libqt4-sqlite kate
# knemo kdeplasma-addons # knemo kdeplasma-addons
#kitchensync4 #kitchensync4
$(MAKEDIST_TARGET)-testcd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress $(MAKEDIST_TARGET)-testcd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
$(MAKEDIST_TARGET)-testcd-root: \ $(MAKEDIST_TARGET)-testcd-root: \
postplug-xorg postplug-sound \ postplug-xorg postplug-sound \
@ -39,5 +39,4 @@ $(MAKEDIST_TARGET)-testcd-root-es: \
$(MAKEDIST_TARGET)-testcd-root-it: \ $(MAKEDIST_TARGET)-testcd-root-it: \
kde-l10n-it kde-l10n-it
# firefox-i18n-it # firefox-i18n-it
#OpenOffice-i18n-it
# FIXME: add kdepim # FIXME: add kdepim