From 77cad8e716e6023e1042c21cb2fe12b3a81f295d Mon Sep 17 00:00:00 2001 From: "Christoph J. Thompson" Date: Mon, 15 Apr 2013 15:48:19 +0200 Subject: 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 --- src/common/plugin.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/common') diff --git a/src/common/plugin.c b/src/common/plugin.c index 4e841717..a1c9286b 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -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 , 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 -- cgit 1.4.1