Merge branch 'master' of github.com:hexchat/hexchat
This commit is contained in:
commit
616b88eea1
|
@ -1,13 +1,7 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
SUBDIRS = po intl src plugins man
|
SUBDIRS = po intl src plugins man share
|
||||||
|
|
||||||
EXTRA_DIST = autogen.sh
|
EXTRA_DIST = autogen.sh
|
||||||
|
|
||||||
icon_DATA = src/pixmaps/hexchat.png
|
|
||||||
icondir = $(datadir)/pixmaps
|
|
||||||
|
|
||||||
util_DATA = share/misc/hexchat.desktop
|
|
||||||
utildir = $(datadir)/applications
|
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
|
@ -950,6 +950,9 @@ AC_SUBST(hexchatlibdir)
|
||||||
|
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
Makefile
|
Makefile
|
||||||
|
share/Makefile
|
||||||
|
share/icons/Makefile
|
||||||
|
share/misc/Makefile
|
||||||
src/Makefile
|
src/Makefile
|
||||||
src/common/Makefile
|
src/common/Makefile
|
||||||
src/common/dbus/Makefile
|
src/common/dbus/Makefile
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
SUBDIRS = icons misc
|
|
@ -0,0 +1,13 @@
|
||||||
|
icon_DATA = ../../src/pixmaps/hexchat.png
|
||||||
|
icondir = $(datadir)/icons/hicolor/48x48/apps
|
||||||
|
|
||||||
|
hicolor_DATA = hexchat.svg
|
||||||
|
hicolordir = $(datadir)/icons/hicolor/scalable/apps
|
||||||
|
|
||||||
|
UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
|
||||||
|
|
||||||
|
install-data-hook:
|
||||||
|
$(UPDATE_ICON_CACHE);
|
||||||
|
|
||||||
|
uninstall-hook:
|
||||||
|
$(UPDATE_ICON_CACHE);
|
|
@ -0,0 +1,3 @@
|
||||||
|
util_DATA = hexchat.desktop
|
||||||
|
utildir = $(datadir)/applications
|
||||||
|
|
Loading…
Reference in New Issue