]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Maintain -L. and -L.libs flags when linking with libldns.la
authorWillem Toorop <willem@nlnetlabs.nl>
Thu, 9 Sep 2021 09:43:38 +0000 (11:43 +0200)
committerWillem Toorop <willem@nlnetlabs.nl>
Thu, 9 Sep 2021 09:43:38 +0000 (11:43 +0200)
Makefile.in

index 89fdf387a409005de348889d1df88ca06341d7be..0134d4147d49c81be33ad8bc96a49f6f0fab9331 100644 (file)
@@ -324,10 +324,10 @@ ldns_wrapper.lo: $(pywrapdir)/ldns_wrapper.c ldns/config.h
        $(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
 
 _ldns.la: ldns_wrapper.lo libldns.la
-       $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) $(LIB) $(PYTHON_LIBS) $(LIBS)
+       $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs $(LIB) $(PYTHON_LIBS) $(LIBS)
 
 $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
-       BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="$$BUILDDIR/$(LIB)" INC="-I$$BUILDDIR"
+       BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs $$BUILDDIR/$(LIB)" INC="-I$$BUILDDIR"
 
 $(p5_dns_ldns_dir)/blib/arch/auto/DNS/LDNS/LDNS.so: $(p5_dns_ldns_dir)/Makefile
        cd $(p5_dns_ldns_dir); $(MAKE)