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.
This commit is contained in:
Alexey Sokolov
2011-03-30 01:18:35 +07:00
parent 97ce939558
commit 6db2ac8ac6
2 changed files with 2 additions and 14 deletions
+1 -6
View File
@@ -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
+1 -8
View File
@@ -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