Fix module data for extra/ modules for real

diff --git a/modules/Makefile.in b/modules/Makefile.in
index 4a4bc0b2984613e10cd8d88cf1a19bb9f97c950e..0ace60153d6a47d688869fd04de2419b1983482b 100644 (file)
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -92,23 +92,23 @@ TARGETS  := $(addsuffix .so, $(FILES))
 
 CLEAN    += *.so extra/*.so
 
-.PHONY: all clean install install_datadir create_install_dir uninstall
+.PHONY: all clean install install_datadir uninstall
 
 all: $(TARGETS)
 
-install: all create_install_dir install_datadir
+install: all install_datadir
        $(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR)$(MODDIR)
 
-create_install_dir:
+install_datadir:
+       rm -rf $(DESTDIR)$(DATADIR)/modules
        mkdir -p $(DESTDIR)$(MODDIR)
-       mkdir -p $(DESTDIR)$(DATADIR)
+       mkdir -p $(DESTDIR)$(DATADIR)/modules
        rm -rf $(DESTDIR)$(MODDIR)/*.so
-       rm -rf $(DESTDIR)$(DATADIR)/modules
-
-install_datadir: create_install_dir
-       cp -R $(srcdir)/data $(DESTDIR)$(DATADIR)/modules
-       # Disabled for now since no module in extra has some data files
-       #cp -R $(srcdir)/extra/data $(DESTDIR)$(DATADIR)/modules
+       mkdir -p $(DESTDIR)$(DATADIR)/modules
+       cp -R $(srcdir)/data/* $(DESTDIR)$(DATADIR)/modules
+       if test "@EXTRA@" = "yes" ; then \
+               cp -R $(srcdir)/extra/data/* $(DESTDIR)$(DATADIR)/modules ; \
+       fi
        find $(DESTDIR)$(DATADIR)/modules -type d -exec chmod 0755 '{}' \;
        find $(DESTDIR)$(DATADIR)/modules -type f -exec chmod 0644 '{}' \;
 

diff --git a/modules/extra/listsockets/tmpl/index.tmpl b/modules/extra/data/listsockets/tmpl/index.tmpl
similarity index 100%
rename from modules/extra/listsockets/tmpl/index.tmpl
rename to modules/extra/data/listsockets/tmpl/index.tmpl

diff --git a/modules/extra/send_raw/tmpl/index.tmpl b/modules/extra/data/send_raw/tmpl/index.tmpl
similarity index 100%
rename from modules/extra/send_raw/tmpl/index.tmpl
rename to modules/extra/data/send_raw/tmpl/index.tmpl