mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Merge the translations into the desktop file on install. Closes #1109.

Browse source
This commit is contained in:
Thomas Goyne 2013-12-24 10:58:28 -08:00
parent 615f3b4880
commit 3e0ef08031
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/configure.ac
View file

@ -534,7 +534,7 @@ DEFAULT_PLAYER_AUDIO=${DEFAULT_PLAYER_AUDIO:-NONE}
############### ###############
# Files that need substitution. # Files that need substitution.
AC_CONFIG_FILES([ AC_CONFIG_FILES([
desktop/aegisub.desktop desktop/aegisub.desktop.template
src/libresrc/default_config_platform.json src/libresrc/default_config_platform.json
tools/osx-bundle.sed tools/osx-bundle.sed
Makefile.inc Makefile.inc

10
aegisub/desktop/Makefile
View file

@ -6,6 +6,8 @@ applications_DATA = aegisub.desktop
iconsscalabledir = $(DESKTOP_DATADIR)/icons/hicolor/scalable/apps iconsscalabledir = $(DESKTOP_DATADIR)/icons/hicolor/scalable/apps
iconsscalable_DATA = scalable/aegisub.svg iconsscalable_DATA = scalable/aegisub.svg
aegisub.desktop: aegisub.desktop.template ../po
intltool-merge --quiet --desktop-style ../po aegisub.desktop.template aegisub.desktop
all: ; all: ;
@ -20,17 +22,17 @@ ICON_HICOLOR = \
ICON_SCALABLE = \ ICON_SCALABLE = \
scalable/apps/aegisub.svg scalable/apps/aegisub.svg
DESKTOP_FILE = \ DESKTOP_FILE = aegisub.desktop
aegisub.desktop
EXTRA_DIST = \ EXTRA_DIST = \
aegisub.desktop.in \ aegisub.desktop.template.in \
aegisub.desktop.template \
$(ICON_HICOLOR) \ $(ICON_HICOLOR) \
$(ICON_SCALABLE) $(ICON_SCALABLE)
install: install-desktop install-icons install: install-desktop install-icons
install-desktop: install-desktop: $(DESKTOP_FILE)
@$(BIN_MKDIR) -p $(DESTDIR)$(P_DESKTOP) @$(BIN_MKDIR) -p $(DESTDIR)$(P_DESKTOP)
$(BIN_INSTALL) $(DESKTOP_FILE) $(DESTDIR)$(P_DESKTOP)/$(DESKTOP_FILE) $(BIN_INSTALL) $(DESKTOP_FILE) $(DESTDIR)$(P_DESKTOP)/$(DESKTOP_FILE)

6
aegisub/desktop/aegisub.desktop.in → aegisub/desktop/aegisub.desktop.template.in
View file

@ -1,9 +1,9 @@
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
Type=Application Type=Application
Name=Aegisub _Name=Aegisub
GenericName=Subtitle Editor _GenericName=Subtitle Editor
Comment=Create and edit subtitles for film and videos. _Comment=Create and edit subtitles for film and videos.
Exec=@AEGISUB_COMMAND@ %f Exec=@AEGISUB_COMMAND@ %f
TryExec=@AEGISUB_COMMAND@ TryExec=@AEGISUB_COMMAND@
Icon=aegisub Icon=aegisub