From a4fc19eb4d97cd9f5b9415f85c54acc8d2f63540 Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Thu, 19 Oct 2017 18:48:21 +0100 Subject: [PATCH] os400: add missing symbols in config file. Also adjust makefile to renamed files and warn about installation dirs mix-up. --- lib/config-os400.h | 10 ++++++++-- packages/OS400/README.OS400 | 3 ++- packages/OS400/makefile.sh | 5 +++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/config-os400.h b/lib/config-os400.h index fe5b864d6..7844444fe 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -403,8 +403,14 @@ /* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + /* The size of `size_t', as computed by sizeof. */ -#define SIZEOF_SIZE_T 8 +#define SIZEOF_SIZE_T 4 + +/* The size of `curl_off_t', as computed by sizeof. */ +#define SIZEOF_CURL_OFF_T 8 /* Whether long long constants must be suffixed by LL. */ diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 552a3cb77..3ee1c0fa5 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -241,7 +241,8 @@ _ If data compression has to be supported, ZLIB development environment must be installed. _ Likewise, if SCP and SFTP protocols have to be compiled in, LIBSSH2 developent environment must be installed. -_ Install the curl source directory in IFS. +_ Install the curl source directory in IFS. Do NOT install it in the + installation target directory (wich defaults to /curl). _ Enter shell (QSH) _ Change current directory to the curl installation directory _ Change current directory to ./packages/OS400 diff --git a/packages/OS400/makefile.sh b/packages/OS400/makefile.sh index 141d8778c..7c6bcd7c6 100644 --- a/packages/OS400/makefile.sh +++ b/packages/OS400/makefile.sh @@ -31,10 +31,11 @@ fi for TEXT in "${TOPDIR}/COPYING" "${SCRIPTDIR}/README.OS400" \ "${TOPDIR}/CHANGES" "${TOPDIR}/docs/THANKS" "${TOPDIR}/docs/FAQ" \ - "${TOPDIR}/docs/FEATURES" "${TOPDIR}/docs/SSLCERTS" \ + "${TOPDIR}/docs/FEATURES" "${TOPDIR}/docs/SSLCERTS.md" \ "${TOPDIR}/docs/RESOURCES" "${TOPDIR}/docs/VERSIONS" \ - "${TOPDIR}/docs/HISTORY" + "${TOPDIR}/docs/HISTORY.md" do MEMBER="`basename \"${TEXT}\" .OS400`" + MEMBER="`basename \"${MEMBER}\" .md`" MEMBER="${LIBIFSNAME}/DOCS.FILE/`db2_name \"${MEMBER}\"`.MBR" if action_needed "${MEMBER}" "${TEXT}"