Commit b897e3a39a1131a91f45fa8edeab8c37f79e63d3
1 parent
82974908
Exists in
master
and in
4 other branches
Fixing branding package.
Showing
2 changed files
with
7 additions
and
2 deletions
Show diff stats
branding/Makefile.in
| @@ -111,7 +111,7 @@ install: \ | @@ -111,7 +111,7 @@ install: \ | ||
| 111 | launcher.desktop \ | 111 | launcher.desktop \ |
| 112 | $(PRODUCT_NAME).desktop | 112 | $(PRODUCT_NAME).desktop |
| 113 | 113 | ||
| 114 | - $(DESKTOP_INSTALL) \ | 114 | + @$(DESKTOP_INSTALL) \ |
| 115 | --mode 644 \ | 115 | --mode 644 \ |
| 116 | --delete-original \ | 116 | --delete-original \ |
| 117 | --dir $(DESTDIR)$(datarootdir)/applications \ | 117 | --dir $(DESTDIR)$(datarootdir)/applications \ |
configure.ac
| @@ -60,7 +60,7 @@ dnl --------------------------------------------------------------------------- | @@ -60,7 +60,7 @@ dnl --------------------------------------------------------------------------- | ||
| 60 | dnl Check for OS specifics | 60 | dnl Check for OS specifics |
| 61 | dnl --------------------------------------------------------------------------- | 61 | dnl --------------------------------------------------------------------------- |
| 62 | 62 | ||
| 63 | -INSTALL_PACKAGES="application locale schemas" | 63 | +INSTALL_PACKAGES="application locale schemas branding" |
| 64 | 64 | ||
| 65 | case "$host" in | 65 | case "$host" in |
| 66 | *-mingw32|*-pc-msys) | 66 | *-mingw32|*-pc-msys) |
| @@ -121,6 +121,8 @@ AC_PATH_TOOL([MSGINIT], [msginit], [no]) | @@ -121,6 +121,8 @@ AC_PATH_TOOL([MSGINIT], [msginit], [no]) | ||
| 121 | AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) | 121 | AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) |
| 122 | AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) | 122 | AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) |
| 123 | 123 | ||
| 124 | +AC_PATH_TOOL([DESKTOP_INSTALL],[desktop-file-install],[no]) | ||
| 125 | + | ||
| 124 | PKG_CHECK_EXISTS | 126 | PKG_CHECK_EXISTS |
| 125 | 127 | ||
| 126 | dnl --------------------------------------------------------------------------- | 128 | dnl --------------------------------------------------------------------------- |
| @@ -209,6 +211,9 @@ AC_CONFIG_FILES(Makefile) | @@ -209,6 +211,9 @@ AC_CONFIG_FILES(Makefile) | ||
| 209 | AC_CONFIG_FILES(schemas/Makefile) | 211 | AC_CONFIG_FILES(schemas/Makefile) |
| 210 | AC_CONFIG_FILES(locale/Makefile) | 212 | AC_CONFIG_FILES(locale/Makefile) |
| 211 | 213 | ||
| 214 | +AC_CONFIG_FILES(branding/Makefile) | ||
| 215 | +AC_CONFIG_FILES(branding/launcher.desktop) | ||
| 216 | + | ||
| 212 | dnl --------------------------------------------------------------------------- | 217 | dnl --------------------------------------------------------------------------- |
| 213 | dnl Output the generated config.status script. | 218 | dnl Output the generated config.status script. |
| 214 | dnl --------------------------------------------------------------------------- | 219 | dnl --------------------------------------------------------------------------- |