Changeset daa32a5 in git for desktop

Timestamp:

Jan 9, 2014, 4:55:13 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

e0a3a0d863b5146af0efd07aa55d745bce5b08fa

Parents:

276a00a9fd2162ed0cb8f0423dc3d21ff6ebeb92

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-09 16:55:13+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-09 16:57:25+01:00

Message:

Let _configure_ generate desctop/Singular*.desktop

Location:

desktop

Files:

• Makefile.am (modified) (1 diff)
• Singular-manual.desktop.in (modified) (1 diff)
• Singular.desktop.in (modified) (1 diff)

desktop/Makefile.am

@@ -6 +6 @@
 desktopdir = $(datadir)/applications
 desktop_DATA = Singular.desktop Singular-manual.desktop
+
 desktop_in = Singular.desktop.in Singular-manual.desktop.in
-
-substvars = sed \
-        -e 's![@]docdir[@]!$(docdir)!g' \
-        -e 's![@]datadir[@]!$(datadir)!g' \
-        -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g'
-
-Singular.desktop: $(abs_srcdir)/Singular.desktop.in
-        $(AM_V_GEN) $(substvars) $(abs_srcdir)/Singular.desktop.in > $@
-
-Singular-manual.desktop: $(abs_srcdir)/Singular-manual.desktop.in
-        $(AM_V_GEN) $(substvars) $(abs_srcdir)/Singular-manual.desktop.in > $@
-
 EXTRA_DIST = $(icons_DATA) $(desktop_in)
-
-CLEANFILES = $(desktop_DATA)

desktop/Singular-manual.desktop.in

@@ -9 +9 @@
 Comment[ru]=
 Type=Link
-URL=file://@docdir@/html/index.htm
-Icon=@datadir@/icons/Singular.png
+URL=file://@DOC_DIR@/html/index.htm
+Icon=@DATA_DIR@/icons/Singular.png
 Categories=Math;Science;Development;Education;Documentation;
 Encoding=UTF-8

desktop/Singular.desktop.in

@@ -11 +11 @@
 Terminal=true
 Categories=Math;Science;Education;
-Icon=@datadir@/icons/Singular.png
+Icon=@DATA_DIR@/icons/Singular.png
 Encoding=UTF-8