Changeset 05cefc in git


Ignore:
Timestamp:
Jun 13, 2013, 10:24:01 AM (10 years ago)
Author:
Mathias Schulze <mschulze@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
d775e519fa82c002572d593226a06c894ef9be59
Parents:
452315867969c1da7eab057b8b646b7e852006c0
Message:
variable folders in desktop files (using @datadir@ etc.)
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    r452315 r05cefc  
    1111TESTDIRS=$(PACKAGES)
    1212
    13  
    1413emacsdir=$(datadir)/singular/emacs
    1514
    … …  
    4746        redhat/singular.spec
    4847
    49 DESKTOP = desktop/Singular.png
     48iconsdir = $(datadir)/icons
     49icons_DATA = desktop/Singular.png
    5050
    51 EXTRA_DIST = autogen.sh $(EMACS) $(DEBIAN) $(REDHAT) $(DESKTOP)
     51desktopdir = $(datadir)/applications
     52desktop_DATA = desktop/Singular.desktop desktop/Singular-manual.desktop
     53
     54substvars = sed \
     55        -e 's|@docdir[@]|$(docdir)|g' \
     56        -e 's|@datadir[@]|$(datadir)|g' \
     57        -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g'
     58desktop/Singular.desktop: desktop/Singular.desktop.in
     59        $(AM_V_GEN) $(substvars) $< > $@
     60desktop/Singular-manual.desktop: desktop/Singular-manual.desktop.in
     61        $(AM_V_GEN) $(substvars) $< > $@
     62desktop_in = desktop/Singular.desktop.in desktop/Singular-manual.desktop.in
     63
     64EXTRA_DIST = autogen.sh $(EMACS) \
     65        $(DEBIAN) $(REDHAT) \
     66        $(icons_DATA) $(desktop_in)
    5267
    5368bin_SCRIPTS = libsingular-config

  • configure.ac

    r452315 r05cefc  
    171171AC_CONFIG_FILES([IntegerProgramming/Makefile])
    172172AC_CONFIG_FILES([libsingular-config])
     173
    173174AC_CONFIG_SUBDIRS([gfanlib])
    174175
    175176AC_CONFIG_FILES([redhat/singular.spec])
    176 AC_CONFIG_FILES([desktop/Singular.desktop])
    177 AC_CONFIG_FILES([desktop/Singular-manual.desktop])
    178177
    179178AC_OUTPUT

  • desktop/Singular-manual.desktop.in

    r452315 r05cefc  
    99Comment[ru]=
    1010Type=Link
    11 URL=file:///usr/share/doc/Singular/html/index.htm
    12 Icon=/usr/share/icons/Singular.png
     11URL=file://@docdir@/html/index.htm
     12Icon=@datadir@/icons/Singular.png
    1313Categories=Math;Science;Development;Education;Documentation;
    1414Encoding=UTF-8

  • desktop/Singular.desktop.in

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