Changeset d775e5 in git for Makefile.am


Ignore:
Timestamp:
Jun 13, 2013, 5:23:32 PM (11 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
e681f379bf042bd7052640aadef90dd176998b63
Parents:
e7cb20744d26d5cc5f5669542c1ef76088ea5c9f05cefcd1a3fc75f18390961692cf2f129bd68c11
Message:
Merge pull request #335 from mschulze/spielwiese

variable folders in desktop files (using @datadir@ etc.)
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    re7cb20 rd775e5  
    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
Note: See TracChangeset for help on using the changeset viewer.