moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't hardcode "plugins" as the subdirectory for plugins in many 

places.

	modified:   config-win32.h
	modified:   configure.ac
	modified:   plugins/checksum/Makefile.am
	modified:   plugins/doat/Makefile.am
	modified:   plugins/fishlim/Makefile.am
	modified:   plugins/perl/Makefile.am
	modified:   plugins/python/Makefile.am
	modified:   plugins/sysinfo/Makefile.am
	modified:   plugins/xdcc/Makefile.am
	modified:   src/common/plugin.c
	modified:   src/fe-text/fe-text.c
This commit is contained in:
Christoph J. Thompson 2013-04-15 15:48:19 +02:00 committed by Berke Viktor
parent 700d699f5b
commit 77cad8e716
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-win32.h
View File

@ -8,7 +8,7 @@
#define HAVE_ISO_CODES
#define PACKAGE_NAME "hexchat"
#define PACKAGE_VERSION "2.9.5"
#define HEXCHATLIBDIR "."
#define HEXCHATLIBDIR ".\\plugins"
#define HEXCHATSHAREDIR "."
#define OLD_PERL
#define GETTEXT_PACKAGE "hexchat"

4
configure.ac
View File

@ -940,14 +940,14 @@ test "x$exec_prefix" = xNONE && exec_prefix="$prefix"
AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")
AS_AC_EXPAND(HEXCHATLIBDIR, "${libdir}/hexchat")
AS_AC_EXPAND(HEXCHATLIBDIR, "${libdir}/hexchat/plugins")
AC_DEFINE_UNQUOTED(HEXCHATLIBDIR, "$HEXCHATLIBDIR")
AS_AC_EXPAND(HEXCHATSHAREDIR, "$datadir")
AC_DEFINE_UNQUOTED(HEXCHATSHAREDIR, "$HEXCHATSHAREDIR")
dnl for plugins/xxx/Makefile.am
hexchatlibdir=${libdir}/hexchat
hexchatlibdir=${libdir}/hexchat/plugins
AC_SUBST(hexchatlibdir)
AC_CONFIG_FILES([

2
plugins/checksum/Makefile.am
View File

@ -1,4 +1,4 @@
libdir = $(hexchatlibdir)/plugins
libdir = $(hexchatlibdir)
lib_LTLIBRARIES = checksum.la
checksum_la_SOURCES = checksum.c

2
plugins/doat/Makefile.am
View File

@ -1,4 +1,4 @@
libdir = $(hexchatlibdir)/plugins
libdir = $(hexchatlibdir)
lib_LTLIBRARIES = doat.la
doat_la_SOURCES = doat.c

2
plugins/fishlim/Makefile.am
View File

@ -1,6 +1,6 @@
EXTRA_DIST = INSTALL LICENSE README
libdir = $(hexchatlibdir)/plugins
libdir = $(hexchatlibdir)
lib_LTLIBRARIES = fishlim.la
fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_hexchat.c

2
plugins/perl/Makefile.am
View File

@ -2,7 +2,7 @@
EXTRA_DIST=alt_completion.pl generate_header lib/Xchat.pm lib/Xchat/Embed.pm lib/Xchat/List/Network.pm \
lib/Xchat/List/Network/Entry.pm lib/Xchat/List/Network/AutoJoin.pm lib/IRC.pm
libdir = $(hexchatlibdir)/plugins
libdir = $(hexchatlibdir)
lib_LTLIBRARIES = perl.la
perl_la_SOURCES = perl.c

2
plugins/python/Makefile.am
View File

@ -1,6 +1,6 @@
EXTRA_DIST =
libdir = $(hexchatlibdir)/plugins
libdir = $(hexchatlibdir)
lib_LTLIBRARIES = python.la
python_la_SOURCES = python.c

2
plugins/sysinfo/Makefile.am
View File

@ -1,4 +1,4 @@
libdir = $(hexchatlibdir)/plugins
libdir = $(hexchatlibdir)
lib_LTLIBRARIES = sysinfo.la
sysinfo_la_SOURCES = hwmon.c match.c parse.c pci.c xsys.c

2
plugins/xdcc/Makefile.am
View File

@ -1,4 +1,4 @@
libdir = $(hexchatdir)/plugins
libdir = $(hexchatdir)
lib_LTLIBRARIES = xdcc.la
xdcc_la_SOURCES = xdcc.c

28
src/common/plugin.c
View File

@ -482,26 +482,26 @@ plugin_auto_load (session *sess)
#ifdef WIN32
/* a long list of bundled plugins that should be loaded automatically,
* user plugins should go to <config>, leave Program Files alone! */
for_files (".\\plugins", "hcchecksum.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcdns.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcdoat.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcexec.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcfishlim.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcmpcinfo.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcperl.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcpython.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcupd.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcwinamp.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcsysinfo.dll", plugin_auto_load_cb);
for_files (".\\plugins", "hcwmpa.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcchecksum.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcdns.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcdoat.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcexec.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcfishlim.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcmpcinfo.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcperl.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcpython.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcupd.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcwinamp.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcsysinfo.dll", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "hcwmpa.dll", plugin_auto_load_cb);
for_files (sub_dir, "*.dll", plugin_auto_load_cb);
#else
#if defined(__hpux)
for_files (HEXCHATLIBDIR "/plugins", "*.sl", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "*.sl", plugin_auto_load_cb);
for_files (sub_dir, "*.sl", plugin_auto_load_cb);
#else
for_files (HEXCHATLIBDIR "/plugins", "*.so", plugin_auto_load_cb);
for_files (HEXCHATLIBDIR, "*.so", plugin_auto_load_cb);
for_files (sub_dir, "*.so", plugin_auto_load_cb);
#endif
#endif

2
src/fe-text/fe-text.c
View File

@ -514,7 +514,7 @@ fe_args (int argc, char *argv[])
}
free (exe);
#else
printf ("%s\n", HEXCHATLIBDIR"/plugins");
printf ("%s\n", HEXCHATLIBDIR);
#endif
return 0;
}