summaryrefslogtreecommitdiff
path: root/sysui/desktop/suse
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-07-23 09:27:17 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-07-23 09:27:17 +0000
commite1995343707515bab2cbb9dbffb800c7c992d0ce (patch)
treef55ae99c4a464279df2e51f2ea4736c521514fae /sysui/desktop/suse
parente999201ec93f482f58c4b4767fcf461dc481b111 (diff)
INTEGRATION: CWS launchertips (1.3.2); FILE MERGED
2004/07/15 13:51:51 obr 1.3.2.3: #i29569#,#i30472# switched to new translation mechanism, removed invalid entries and added tooltips/help strings 2004/07/14 14:14:01 obr 1.3.2.2: #i30472# No X-Redhat-Base for SuSE files 2004/07/14 14:09:58 obr 1.3.2.1: #i20355#,#i20356# install gnome files to /opt/gnome2
Diffstat (limited to 'sysui/desktop/suse')
-rw-r--r--sysui/desktop/suse/makefile.mk38
1 files changed, 17 insertions, 21 deletions
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk
index 316619da94c5..db5f4343498f 100644
--- a/sysui/desktop/suse/makefile.mk
+++ b/sysui/desktop/suse/makefile.mk
@@ -77,7 +77,7 @@ LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop
LAUNCHERDIR = $(shell cd $(MISC)$/$(TARGET); pwd)
LAUNCHERFLAGFILES = \
- $(MISC)/$(TARGET)/opt/gnome/share/applications.flag \
+ $(MISC)/$(TARGET)/opt/gnome2/share/applications.flag \
$(MISC)/$(TARGET)/opt/kde3/share/applnk/Office.flag
MIMELIST = \
@@ -112,18 +112,18 @@ KDEICONLIST = \
RPMFLAGFILE = $(MISC)$/$(TARGET).flag
RPMDEPN = \
- $(MISC)/$(TARGET)/opt/gnome/share/applications.flag \
+ $(MISC)/$(TARGET)/opt/gnome2/share/applications.flag \
$(MISC)/$(TARGET)/opt/kde3/share/applnk/Office.flag \
- $(MISC)/$(TARGET)/opt/gnome/share/application-registry/$(UNIXFILENAME).applications \
- $(MISC)/$(TARGET)/opt/gnome/share/mime-info/$(UNIXFILENAME).keys \
+ $(MISC)/$(TARGET)/opt/gnome2/share/application-registry/$(UNIXFILENAME).applications \
+ $(MISC)/$(TARGET)/opt/gnome2/share/mime-info/$(UNIXFILENAME).keys \
$(MISC)/$(TARGET)/opt/kde3/share/mimelnk/application.flag \
- $(MISC)/$(TARGET)/opt/gnome/share/icons/gnome/{$(GNOMEICONLIST)} \
+ $(MISC)/$(TARGET)/opt/gnome2/share/icons/gnome/{$(GNOMEICONLIST)} \
$(MISC)/$(TARGET)/opt/kde3/share/icons/{$(KDEICONLIST)}
RPMDIR = $(shell cd $(BIN); pwd)
+ULFDIR = $(COMMONMISC)$/desktopshare
.ENDIF
-
# --- Targets -------------------------------------------------------
@@ -139,29 +139,25 @@ ALLTAR : $(RPMFLAGFILE)
# Copy/patch the .desktop files to the output tree and
# merge-in the translations.
#
-$(LAUNCHERFLAGFILES) : $(LAUNCHERDEPN) ../share/brand.pl ../share/translate.pl ../share/launcher_name.ulf ../share/launcher_comment.ulf
+$(LAUNCHERFLAGFILES) : $(LAUNCHERDEPN) ../share/brand.pl ../share/translate.pl $(ULFDIR)/launcher_name.ulf $(ULFDIR)/launcher_comment.ulf
@$(MKDIRHIER) $(@:db)
@echo Creating desktop entries ..
@echo ---------------------------------
- @$(PERL) ../share/brand.pl -p "$(LONGPRODUCTNAME)" -u $(UNIXFILENAME) --prefix "$(UNIXFILENAME)-" --iconprefix "$(UNIXFILENAME)-" --category "X-Red-Hat-Base" $(LAUNCHERDEPN) $(@:db)
- @$(PERL) ../share/translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Name" ../share/launcher_name.ulf
+ @$(PERL) ../share/brand.pl -p "$(LONGPRODUCTNAME)" -u $(UNIXFILENAME) --prefix "$(UNIXFILENAME)-" --iconprefix "$(UNIXFILENAME)-" $(LAUNCHERDEPN) $(@:db)
+ @$(PERL) ../share/translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Name" $(ULFDIR)/launcher_name.ulf
+ @$(PERL) ../share/translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Comment" $(ULFDIR)/launcher_comment.ulf
.IF "$(WITH_LIBSN)"=="YES"
@$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db)/$(UNIXFILENAME)-$i.desktop))
.ENDIF
@touch $@
-#
-# FIXME: disabled comments for now due to missing string review
-# @$(PERL) translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Comment" ../share/launcher_comment.ulf
-#
-
# --- icons --------------------------------------------------------
#
# This target is responsible for copying the GNOME icons to their package specific target
-# e.g. $(LAUNCHERDIR)/opt/gnome/share/icons/gnome/16x16/apps/openoffice-writer.png
+# e.g. $(LAUNCHERDIR)/opt/gnome2/share/icons/gnome/16x16/apps/openoffice-writer.png
#
-$(MISC)/$(TARGET)/opt/gnome/share/icons/gnome/{$(GNOMEICONLIST)} : ../icons/hicolor/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(UNIXFILENAME)-//)
+$(MISC)/$(TARGET)/opt/gnome2/share/icons/gnome/{$(GNOMEICONLIST)} : ../icons/hicolor/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(UNIXFILENAME)-//)
@$(MKDIRHIER) $(@:d)
@$(COPY) $< $@
@@ -171,23 +167,23 @@ $(MISC)/$(TARGET)/opt/kde3/share/icons/{$(KDEICONLIST)} : ../icons/$$(@:d:d:d:d:
# --- mime types ---------------------------------------------------
-$(MISC)/$(TARGET)/opt/gnome/share/mime-info/$(UNIXFILENAME).keys : $(GNOMEMIMEDEPN) ../share/brand.pl ../share/translate.pl ../share/documents.ulf
+$(MISC)/$(TARGET)/opt/gnome2/share/mime-info/$(UNIXFILENAME).keys : $(GNOMEMIMEDEPN) ../share/brand.pl ../share/translate.pl $(ULFDIR)/documents.ulf
@$(MKDIRHIER) $(@:d)
@echo Creating GNOME .keys file ..
@echo ---------------------------------
@$(PERL) ../share/brand.pl -p $(PRODUCTNAME) -u $(UNIXFILENAME) --iconprefix "$(UNIXFILENAME)-" $(GNOMEMIMEDEPN) $(MISC)/$(TARGET)
- @$(PERL) ../share/translate.pl -p $(PRODUCTNAME) -d $(MISC)/$(TARGET) --ext "keys" --key "description" ../share/documents.ulf
+ @$(PERL) ../share/translate.pl -p $(PRODUCTNAME) -d $(MISC)/$(TARGET) --ext "keys" --key "description" $(ULFDIR)/documents.ulf
@cat $(MISC)/$(TARGET)/{$(MIMELIST)}.keys > $@
-$(KDEMIMEFLAGFILE) : $(KDEMIMEDEPN) ../share/brand.pl ../share/translate.pl ../share/documents.ulf
+$(KDEMIMEFLAGFILE) : $(KDEMIMEDEPN) ../share/brand.pl ../share/translate.pl $(ULFDIR)/documents.ulf
@$(MKDIRHIER) $(@:db)
@echo Creating KDE mimelnk entries ..
@echo ---------------------------------
@$(PERL) ../share/brand.pl -p "$(PRODUCTNAME)" -u $(UNIXFILENAME) --prefix "$(UNIXFILENAME)-" --iconprefix "$(UNIXFILENAME)-" $(KDEMIMEDEPN) $(@:db)
- @$(PERL) ../share/translate.pl -p "$(PRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Comment" ../share/documents.ulf
+ @$(PERL) ../share/translate.pl -p "$(PRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Comment" $(ULFDIR)/documents.ulf
@touch $@
-$(MISC)/$(TARGET)/opt/gnome/share/application-registry/$(UNIXFILENAME).applications : ../mimetypes/openoffice.applications
+$(MISC)/$(TARGET)/opt/gnome2/share/application-registry/$(UNIXFILENAME).applications : ../mimetypes/openoffice.applications
@$(MKDIRHIER) $(@:d)
@echo Creating GNOME .applications file ..
@echo ---------------------------------