Merge branch 'modulesdata'

Conflicts:
	modules/Makefile.in

Modules.cpp

@@ -1064,7 +1064,7 @@ CModules::ModDirList CModules::GetModDirs() {
 #ifdef RUN_FROM_SOURCE
 	// ./modules
 	sDir = CZNC::Get().GetCurPath() + "/modules/";
-	ret.push(std::make_pair(sDir, sDir));
+	ret.push(std::make_pair(sDir, sDir + "data/"));
 
 	// ./modules/extra
 	sDir = CZNC::Get().GetCurPath() + "/modules/extra/";
@@ -1076,7 +1076,7 @@ CModules::ModDirList CModules::GetModDirs() {
 	ret.push(std::make_pair(sDir, sDir));
 
 	// <moduledir> and <datadir> (<prefix>/lib/znc)
-	ret.push(std::make_pair(_MODDIR_ + CString("/"), _DATADIR_ + CString("/")));
+	ret.push(std::make_pair(_MODDIR_ + CString("/"), _DATADIR_ + CString("/modules/")));
 
 	return ret;
 }

modules/Makefile.in

@@ -89,27 +89,23 @@ TARGETS  := $(addsuffix .so, $(FILES))
 
 CLEAN    += *.so extra/*.so
 
-.PHONY: all clean install install_metadirs create_install_dir uninstall
+.PHONY: all clean install install_datadir create_install_dir uninstall
 
 all: $(TARGETS)
 
-install: all create_install_dir install_metadirs
+install: all create_install_dir install_datadir
 	$(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR)$(MODDIR)
 
 create_install_dir:
 	mkdir -p $(DESTDIR)$(MODDIR)
 	mkdir -p $(DESTDIR)$(DATADIR)
 	rm -rf $(DESTDIR)$(MODDIR)/*.so
+	rm -rf $(DESTDIR)$(DATADIR)/modules
 
-install_metadirs: create_install_dir
-	for a in $(srcdir)/*; do \
-		d=$$(echo $$a | sed -e "s:$(srcdir)/::g;s:modperl::;s:modpython::"); \
-		if [ -d $$a ] && [ -f $${d}.so ]; then \
-			cp -R $$a $(DESTDIR)$(DATADIR); \
-			find $(DESTDIR)$(DATADIR)/$$d -type d -exec chmod 0755 '{}' \;; \
-			find $(DESTDIR)$(DATADIR)/$$d -type f -exec chmod 0644 '{}' \;; \
-		fi \
-	done
+install_datadir: create_install_dir
+	cp -R $(srcdir)/data $(DESTDIR)$(DATADIR)/modules
+	find $(DESTDIR)$(DATADIR)/modules -type d -exec chmod 0755 '{}' \;
+	find $(DESTDIR)$(DATADIR)/modules -type f -exec chmod 0644 '{}' \;
 
 clean:
 	rm -rf $(CLEAN)