From 6db2ac8ac60893e9f517cc27a2e2644f211b1be9 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Wed, 30 Mar 2011 01:18:35 +0700 Subject: [PATCH] Fix modperl and modpython installations. When modules' static data files were moved to own dir, install_metadirs was removed from Makefile. But modperl and modpython's makefiles still had dependance on it. --- modules/modperl/Makefile.inc | 7 +------ modules/modpython/Makefile.inc | 9 +-------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/modules/modperl/Makefile.inc b/modules/modperl/Makefile.inc index 7831c2ba..2edac80a 100644 --- a/modules/modperl/Makefile.inc +++ b/modules/modperl/Makefile.inc @@ -43,15 +43,10 @@ modperl/functions.cpp: modperl/functions.in @mkdir -p modperl $(Q)$(PERL) $(srcdir)/modperl/codegen.pl $< $@ -modperl_install: create_install_dir install_metadirs modperl.so +modperl_install: create_install_dir modperl.so for i in $(wildcard $(srcdir)/*.pm); do \ $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ done - for a in $(srcdir)/*; do \ - if [ -d $$a ] && [ -f $${a}.pm ]; then \ - cp -Rp $$a $(DESTDIR)$(DATADIR); \ - fi \ - done mkdir -p $(DESTDIR)$(MODDIR)/modperl $(INSTALL_PROGRAM) modperl/ZNC.so $(DESTDIR)$(MODDIR)/modperl $(INSTALL_DATA) modperl/ZNC.pm $(DESTDIR)$(MODDIR)/modperl diff --git a/modules/modpython/Makefile.inc b/modules/modpython/Makefile.inc index 12e6b072..49061a9b 100644 --- a/modules/modpython/Makefile.inc +++ b/modules/modpython/Makefile.inc @@ -58,17 +58,10 @@ modpython/compiler: modpython/compiler.cpp Makefile $(E) Building optimizer for python files... $(Q)$(CXX) $(PYTHONCOMMON) -o $@ $< -modpython_install: create_install_dir install_metadirs modpython_all +modpython_install: create_install_dir modpython_all -for i in *.pyc; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ done - for a in $(srcdir)/*; do \ - if [ -d $$a ]; then \ - if [ -f $${a}.py ]; then \ - cp -Rp $$a $(DESTDIR)$(DATADIR); \ - fi \ - fi \ - done mkdir -p $(DESTDIR)$(MODDIR)/modpython $(INSTALL_PROGRAM) modpython/_znc_core.so $(DESTDIR)$(MODDIR)/modpython $(INSTALL_DATA) modpython/znc_core.pyc $(DESTDIR)$(MODDIR)/modpython