summary refs log tree commit diff stats
path: root/Makefile.am
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2012-12-17 16:48:52 -0500
committerTingPing <tingping@tingping.se>2012-12-17 16:48:52 -0500
commit616b88eea1a132f0c962cfc26e4dbbf5ff561ab8 (patch)
tree2147d668f47a7d24573569de3e8093a130bf7219 /Makefile.am
parentaf9b65ee7807452cce04d94a7f8436dce8e9475f (diff)
parent49f268d71ec235cd7659c53511440a6ebe6f98b7 (diff)
Merge branch 'master' of github.com:hexchat/hexchat
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 1 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 40ed64e9..91ca9d79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,7 @@
 ## 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
 
-icon_DATA = src/pixmaps/hexchat.png
-icondir = $(datadir)/pixmaps
-
-util_DATA = share/misc/hexchat.desktop
-utildir = $(datadir)/applications
-
 ACLOCAL_AMFLAGS = -I m4