mirror of
https://github.com/znc/znc.git
synced 2026-07-03 16:31:49 +02:00
Fix modules/Makefile.in
- Perl module (*.pm) were not installed - With -j stuff was (tried to) install before create_install_dir was ran git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@850 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
+8
-6
@@ -10,6 +10,9 @@ prefix = @prefix@
|
||||
ifneq "$(PERL)" ""
|
||||
PERLCC = -DHAVE_PERL `$(PERL) -MExtUtils::Embed -e perl_inc`
|
||||
PERLLD = `$(PERL) -MExtUtils::Embed -e perl_inc -e ldopts`
|
||||
PERLHOOK = modperl_install
|
||||
else
|
||||
PERLHOOK =
|
||||
endif
|
||||
|
||||
ifeq "@NOSSL@" "1"
|
||||
@@ -28,7 +31,7 @@ TARGETS = $(addsuffix .so, $(FILES))
|
||||
|
||||
CLEAN = *.so *.o
|
||||
|
||||
.PHONY: all clean install depend $(INSTALL_TARGS)
|
||||
.PHONY: all clean install depend modperl_install
|
||||
|
||||
all: $(OBJS) $(TARGETS)
|
||||
|
||||
@@ -37,14 +40,14 @@ all: $(OBJS) $(TARGETS)
|
||||
|
||||
depend: .depend
|
||||
|
||||
install: all create_install_dir install_metadirs
|
||||
install: all create_install_dir install_metadirs $(PERLHOOK)
|
||||
install -m 0755 $(TARGETS) $(DESTDIR)$(MODDIR)/znc
|
||||
|
||||
create_install_dir:
|
||||
mkdir -p $(DESTDIR)$(MODDIR)/znc
|
||||
rm -rf $(DESTDIR)$(MODDIR)/znc/*.so
|
||||
|
||||
install_metadirs:
|
||||
install_metadirs: create_install_dir
|
||||
for a in *; do \
|
||||
if [ -d $$a ] && [ -f $${a}.so ]; then \
|
||||
cp -Rp $$a $(DESTDIR)$(MODDIR)/znc; \
|
||||
@@ -67,8 +70,7 @@ modperl.so: modperl.o
|
||||
modperl.o: modperl.cpp
|
||||
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $< $(PERLCC)
|
||||
|
||||
install_modperl.so:
|
||||
install -m 0755 modperl.so $(DESTDIR)$(MODDIR)/znc
|
||||
modperl_install: create_install_dir
|
||||
for i in *.pm; do \
|
||||
install -m 0755 $$i $(DESTDIR)$(MODDIR)/znc; \
|
||||
done
|
||||
@@ -77,7 +79,7 @@ modperl.so:
|
||||
@echo -n ""
|
||||
modperl.o:
|
||||
@echo -n ""
|
||||
install_modperl.so:
|
||||
modperl_install:
|
||||
@echo -n ""
|
||||
endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user