From 79aa6c841ebe65c45dea1c15425bc3f3a53dbae4 Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Tue, 26 Feb 2008 21:24:03 +0000 Subject: [PATCH] fixed install target to create a ca-bundle.crt since we have no longer one in the project. --- lib/Makefile.netware | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 0dfcc517d..26c891977 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -74,6 +74,7 @@ ifdef METROWERKS else CC = gcc endif +PERL = perl # a native win32 awk can be downloaded from here: # http://www.gknw.net/development/prgtools/awk-20070501.zip AWK = awk @@ -170,6 +171,7 @@ ifdef WITH_SSL LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT) IMPORTS += GetProcessSwitchCount RunningProcess + INSTDEP += ca-bundle.crt endif ifdef WITH_ZLIB INCLUDES += -I$(ZLIB_PATH) @@ -241,7 +243,7 @@ dist: all -$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv -$(RM) $(OBJDIR)/$(TARGET).def $(OBJDIR)/version.inc $(XDCDATA) -install: $(INSTDIR) all +install: $(INSTDIR) all $(INSTDEP) @$(CP) $(TARGET).nlm $(INSTDIR) @$(CP) $(TARGET).$(LIBEXT) $(INSTDIR) @$(CP) ../CHANGES $(INSTDIR) @@ -249,7 +251,7 @@ install: $(INSTDIR) all @$(CP) ../README $(INSTDIR) @$(CP) ../RELEASE-NOTES $(INSTDIR) ifdef WITH_SSL - @$(CP) ca-bundle.crt $(INSTDIR) + @-$(CP) ca-bundle.crt $(INSTDIR)/ca-bundle.crt endif clean: @@ -260,10 +262,10 @@ distclean: clean -$(RM) -r $(TARGET).$(LIBEXT) $(TARGET).nlm $(INSTDIR): - @mkdir $(INSTDIR) + @mkdir $@ $(OBJDIR): - @mkdir $(OBJDIR) + @mkdir $@ $(TARGET).$(LIBEXT): $(OBJS) @echo Creating $@ @@ -574,4 +576,8 @@ endif $(ARES_LIB)/libcares.$(LIBEXT): $(MAKE) -C $(ARES_LIB) -f Makefile.netware lib +ca-bundle.crt: mk-ca-bundle.pl + @echo Creating $@ + @-$(PERL) $< -b -n $@ +