Remove developer CFLAGS if a release build is to be made.

diff --git a/build/autogen.sh b/build/autogen.sh
index d82a401f920c6ea0e1c6a95eb86a90784cacc5c1..e73162465d2a31b10e2dc12b15bf51c653a7f82e 100755 (executable)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -48,6 +48,11 @@ perl -p -i -e "s/^(#define\tARCHIVE_VERSION_STRING).*/\$1 \"libarchive $VS\"/" l
 perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_S\]),.*\)/$1,['"$VS"'])/' configure.ac
 perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_N\]),.*\)/$1,['"$VN"'])/' configure.ac
 
+# Remove developer CFLAGS if a release build is being made
+if [ -n "${MAKE_LIBARCHIVE_RELEASE}" ]; then
+  perl -p -i -e "s/^(DEV_CFLAGS.*)/# \$1/" Makefile.am
+fi
+
 set -xe
 aclocal -I build/autoconf
 

diff --git a/build/makerelease.sh b/build/makerelease.sh
index a8aa23b026c06749b4eded0655b2d969b2ece8ca..f2869dfca5edc9e7848a2f99812045afeeb7ad52 100755 (executable)
--- a/build/makerelease.sh
+++ b/build/makerelease.sh
@@ -46,6 +46,7 @@ rm -rf _cmtest
 #
 # Construct and verify the autoconf build system
 #
+export MAKE_LIBARCHIVE_RELEASE="1"
 /bin/sh build/autogen.sh
 
 # Get the newest config.guess/config.sub from savannah.gnu.org