Changeset daa32a5 in git


Ignore:
Timestamp:
Jan 9, 2014, 4:55:13 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
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
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r276a00 rdaa32a5  
    194194AX_NORMALIZE_PATH([config_datadir],['/'])
    195195AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
     196AC_SUBST(DATA_DIR)
     197
     198AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
     199AX_NORMALIZE_PATH([config_docdir],['/'])
     200AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
     201AC_SUBST(DOC_DIR)
    196202
    197203SING_SHOW_FLAGS([Compiler/linker flags: ])
     
    234240AC_CONFIG_FILES([redhat/Makefile])
    235241AC_CONFIG_FILES([redhat/singular.spec])
    236 AC_CONFIG_FILES([desktop/Makefile])
     242AC_CONFIG_FILES([desktop/Makefile desktop/Singular.desktop desktop/Singular-manual.desktop])
    237243
    238244AC_OUTPUT
  • desktop/Makefile.am

    r276a00 rdaa32a5  
    66desktopdir = $(datadir)/applications
    77desktop_DATA = Singular.desktop Singular-manual.desktop
     8
    89desktop_in = Singular.desktop.in Singular-manual.desktop.in
    9 
    10 substvars = sed \
    11         -e 's![@]docdir[@]!$(docdir)!g' \
    12         -e 's![@]datadir[@]!$(datadir)!g' \
    13         -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g'
    14 
    15 Singular.desktop: $(abs_srcdir)/Singular.desktop.in
    16         $(AM_V_GEN) $(substvars) $(abs_srcdir)/Singular.desktop.in > $@
    17 
    18 Singular-manual.desktop: $(abs_srcdir)/Singular-manual.desktop.in
    19         $(AM_V_GEN) $(substvars) $(abs_srcdir)/Singular-manual.desktop.in > $@
    20 
    2110EXTRA_DIST = $(icons_DATA) $(desktop_in)
    22 
    23 CLEANFILES = $(desktop_DATA)
  • desktop/Singular-manual.desktop.in

    r276a00 rdaa32a5  
    99Comment[ru]=
    1010Type=Link
    11 URL=file://@docdir@/html/index.htm
    12 Icon=@datadir@/icons/Singular.png
     11URL=file://@DOC_DIR@/html/index.htm
     12Icon=@DATA_DIR@/icons/Singular.png
    1313Categories=Math;Science;Development;Education;Documentation;
    1414Encoding=UTF-8
  • desktop/Singular.desktop.in

    r276a00 rdaa32a5  
    1111Terminal=true
    1212Categories=Math;Science;Education;
    13 Icon=@datadir@/icons/Singular.png
     13Icon=@DATA_DIR@/icons/Singular.png
    1414Encoding=UTF-8
    1515
Note: See TracChangeset for help on using the changeset viewer.