Include arpa/inet.h, since that's where htons() and friends are

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 9642da8f6a82ce231cc94d77867034b26c41935b..0f410c08ae8a404b40f5af967ac74813e186c978 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -11,6 +11,7 @@ SHLIB_MAJOR=
 SHLIB_MINOR=
 PLATFORM=dist
 OPTIONS=
+CONFIGURE_ARGS=
 SHLIB_TARGET=
 
 # INSTALL_PREFIX is for package builders so that they can configure
@@ -61,7 +62,7 @@ AR=ar r
 RANLIB= ranlib
 PERL= perl
 TAR= tar
-TARFLAGS= --norecurse
+TARFLAGS= --no-recursion
 
 # Set BN_ASM to bn_asm.o if you want to use the C version
 BN_ASM= bn_asm.o
@@ -160,7 +161,7 @@ SHLIBDIRS= crypto ssl
 
 # dirs in crypto to build
 SDIRS=  \
-       md2 md5 sha mdc2 hmac ripemd \
+       md2 md4 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
        bn rsa dsa dh dso \
        buffer bio stack lhash rand err objects \
@@ -261,7 +262,7 @@ linux-shared:
        ( set -x; ${CC}  -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
                -Wl,-S,-soname=lib$$i.so.${SHLIB_MAJOR} \
                -Wl,--whole-archive lib$$i.a \
-               -Wl,--no-whole-archive $$libs -lc ) || exit 1; \
+               -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
        libs="$$libs -L. -l$$i"; \
        ( set -x; \
                ln -s lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ -274,7 +275,7 @@ true64-shared:
        libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
        ( set -x; ${CC}  -shared -no_archive -o lib$$i.so \
                -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
-               -all lib$$i.a -none $$libs -lc ) || exit 1; \
+               -all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \
        libs="$$libs -L. -l$$i"; \
        done
 
@@ -286,7 +287,7 @@ solaris-shared:
                lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
        ( set -x; ${CC}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
                -h lib$$i.so.${SHLIB_MAJOR} \
-               -z allextract lib$$i.a $$libs -lc ) || exit 1; \
+               -z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
        libs="$$libs -L. -l$$i"; \
        ln -s lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
                lib$$i.so.${SHLIB_MAJOR}; \
@@ -472,19 +473,19 @@ install_docs:
                $(INSTALL_PREFIX)$(MANDIR)/man3 \
                $(INSTALL_PREFIX)$(MANDIR)/man5 \
                $(INSTALL_PREFIX)$(MANDIR)/man7
-       @echo installing man 1 and man 5
        @for i in doc/apps/*.pod; do \
                fn=`basename $$i .pod`; \
                sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; \
+               echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
                (cd `dirname $$i`; \
                $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
                         --release=$(VERSION) `basename $$i`) \
                        >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
        done
-       @echo installing man 3 and man 7
        @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
                fn=`basename $$i .pod`; \
                sec=`[ "$$fn" = "des_modes" ] && echo 7 || echo 3`; \
+               echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
                (cd `dirname $$i`; \
                $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
                        --release=$(VERSION) `basename $$i`) \