summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorChristoph J. Thompson <cjsthompson@gmail.com>2013-04-15 15:48:19 +0200
committerBerke Viktor <bviktor@hexchat.org>2013-04-28 16:42:48 +0200
commit77cad8e716e6023e1042c21cb2fe12b3a81f295d (patch)
treea2eab6f9e6479801fc30524edfe91aacc12dc5d6 /src
parent700d699f5bbd98d994ae81c3d3f863f8be0c98c2 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/common/plugin.c28
-rw-r--r--src/fe-text/fe-text.c2
2 files changed, 15 insertions, 15 deletions
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 <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
diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c
index bff86bfd..91aa1f0c 100644
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@@ -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;
 	}