From e86ff3219dfd3a9ee71a3ba9d0150dca1872135f Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Fri, 5 Aug 2011 22:16:21 +0100
Subject: [PATCH] Fix module data for extra/ modules for real

---
 modules/Makefile.in                           | 22 +++++++++----------
 .../{ => data}/listsockets/tmpl/index.tmpl    |  0
 .../extra/{ => data}/send_raw/tmpl/index.tmpl |  0
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename modules/extra/{ => data}/listsockets/tmpl/index.tmpl (100%)
 rename modules/extra/{ => data}/send_raw/tmpl/index.tmpl (100%)

diff --git a/modules/Makefile.in b/modules/Makefile.in
index 4a4bc0b2..0ace6015 100644
--- 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:
-	mkdir -p $(DESTDIR)$(MODDIR)
-	mkdir -p $(DESTDIR)$(DATADIR)
-	rm -rf $(DESTDIR)$(MODDIR)/*.so
+install_datadir:
 	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)$(MODDIR)
+	mkdir -p $(DESTDIR)$(DATADIR)/modules
+	rm -rf $(DESTDIR)$(MODDIR)/*.so
+	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