Skip to content
Browse files

Fix module data for extra/ modules for real

  • Loading branch information...
1 parent da0ba75 commit e86ff3219dfd3a9ee71a3ba9d0150dca1872135f @kylef kylef committed Aug 5, 2011
View
20 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 '{}' \;
View
0 modules/extra/listsockets/tmpl/index.tmpl → ...es/extra/data/listsockets/tmpl/index.tmpl
File renamed without changes.
View
0 modules/extra/send_raw/tmpl/index.tmpl → modules/extra/data/send_raw/tmpl/index.tmpl
File renamed without changes.

0 comments on commit e86ff32

Please sign in to comment.
Something went wrong with that request. Please try again.