Fix znc-buildmod on cygwin when installed to not /usr

1. Use import library, so don't require -L/bin anymore
2. Move -lznc from LDFLAGS to LIBS
3. Fix variables in znc-buildmod. It worked before only because
   ${exec_prefix} was resolving to empty string, and /bin == /usr/bin on
   cygwin.
This commit is contained in:
Alexey Sokolov
2015-08-22 12:42:28 +01:00
parent 786d94fbe4
commit 4aba9fed17
7 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -63,7 +63,7 @@ C=
endif
ifneq "$(LIBZNC)" ""
LDFLAGS += -L.. -lznc-$(LIBZNC_VERSION) -Wl,-rpath,$(LIBZNCDIR)
LIBS += -L.. -lznc-$(LIBZNC_VERSION) -Wl,-rpath,$(LIBZNCDIR)
endif
CLEAN :=
+1 -1
View File
@@ -44,7 +44,7 @@ modperl_all: modperl/ZNC.$(PERLCEXT_EXT) modperl/swigperlrun.h modperl/functions
modperl/ZNC.$(PERLCEXT_EXT): modperl/ZNC.o Makefile modperl.so
$(E) Linking ZNC Perl bindings library...
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PERL_LD) $(PERLDEPONMOD)
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PERL_LD) $(PERLDEPONMOD) $(LIBS)
modperl/ZNC.o: modperl/ZNC.cpp Makefile
@mkdir -p modperl
+1 -1
View File
@@ -52,7 +52,7 @@ modpython/_znc_core.o: modpython/_znc_core.cpp Makefile
modpython/_znc_core.$(PYCEXT_EXT): modpython/_znc_core.o Makefile modpython.so
$(E) Linking ZNC python bindings library...
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PY_LDFLAGS) $(PYDEPONMOD)
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PY_LDFLAGS) $(PYDEPONMOD) $(LIBS)
ifneq "$(SWIG)" ""
include $(srcdir)/modpython/Makefile.gen