Move the desktop dir under the packages dir

This commit is contained in:
Thomas Goyne 2014-06-09 06:56:01 -07:00
parent b777cae2fe
commit 168cb8d7ef
12 changed files with 8 additions and 8 deletions

4
.gitignore vendored
View file

@ -59,10 +59,10 @@ config.log
config.status
config_windows.h
configure
desktop/aegisub.desktop
desktop/aegisub.desktop.template
git_version.h
git_version.xml
packages/desktop/aegisub.desktop
packages/desktop/aegisub.desktop.template
src/aegisub
src/libresrc/bitmap.cpp
src/libresrc/bitmap.h

View file

@ -1,6 +1,7 @@
include Makefile.inc
SUBDIRS += \
packages/desktop \
vendor/luajit \
vendor/universalchardet \
vendor/luabins \
@ -8,7 +9,6 @@ SUBDIRS += \
tools \
src \
automation \
desktop \
po
all: ;

View file

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

View file

Before

Width:  |  Height:  |  Size: 895 B

After

Width:  |  Height:  |  Size: 895 B

View file

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View file

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View file

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View file

@ -1,4 +1,4 @@
include ../Makefile.inc
include ../../Makefile.inc
applicationsdir = $(DESKTOP_DATADIR)/applications
applications_DATA = aegisub.desktop
@ -6,8 +6,8 @@ applications_DATA = aegisub.desktop
iconsscalabledir = $(DESKTOP_DATADIR)/icons/hicolor/scalable/apps
iconsscalable_DATA = scalable/aegisub.svg
aegisub.desktop: aegisub.desktop.template ../po
intltool-merge --quiet --desktop-style ../po aegisub.desktop.template aegisub.desktop
aegisub.desktop: aegisub.desktop.template ../../po
intltool-merge --quiet --desktop-style ../../po aegisub.desktop.template aegisub.desktop
all: ;
@ -50,4 +50,4 @@ install-icons:
DISTCLEANFILES = aegisub.desktop
include ../Makefile.target
include ../../Makefile.target

View file

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB