diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..24e71cdbb
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    labels:
+      - "Bot"
+    groups:
+      github-actions:
+        patterns:
+          - '*'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index def9499be..dc6603ee8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,40 +3,37 @@ name: CI
 on: ["push", "pull_request"]
 
 jobs:
-  build_ubuntu:
-    name: Build Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: build
-      run: |
-        sudo apt-get update
-        sudo apt install gcc build-essential libx11-dev libxt-dev libxext-dev libxft-dev libxtst-dev 
-        sudo apt install flex byacc libmotif-common libmotif-dev libxpm4 libxpm-dev
-        sudo apt install gfortran
-        . Gemenviron.profile
-        rm -f config/Makeinc.linux64_gfortran
-        ln -s `pwd`/config/Makeinc.linux64_gfortran_ubuntu config/Makeinc.linux64_gfortran
-        make all
-
   build:
-    name: Build Centos (${{ matrix.OS_VERSION }})
+    name: Build ${{ matrix.os_type }} (${{ matrix.os_version }})
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     strategy:
       matrix:
-        OS_VERSION: ["7", "stream8"]
-    env:
-      OS_VERSION: ${{ matrix.OS_VERSION }}
-      OS_TYPE: "centos"
+        include:
+          - os_type: ubuntu
+            os_version: "24.04"
+            container_image: ubuntu:24.04
+            release_glob: build/dist/*.deb
+          - os_type: almalinux
+            os_version: "8"
+            container_image: quay.io/almalinuxorg/8-base
+            release_glob: build/dist/*.rpm
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+
+    - name: Pull container image
+      run: |
+        sudo docker pull ${{ matrix.container_image }}
 
     - name: build
       run: |
-        echo 'DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock -s devicemapper"' | sudo tee /etc/default/docker > /dev/null
-        sudo service docker restart
-        sleep 5
-        sudo docker pull quay.io/centos/${OS_TYPE}:${OS_VERSION}
-        build/setup.sh ${OS_TYPE} ${OS_VERSION}
+        build/setup.sh ${{ matrix.os_type }} ${{ matrix.os_version }}
 
+    - name: Attach assets to GitHub Release
+      if: github.ref_type == 'tag'
+      uses: softprops/action-gh-release@v2
+      with:
+        files: |
+          ${{ matrix.release_glob }}
+        fail_on_unmatched_files: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7146ac1e3..cd88d0f03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 <!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->
 # Unidata Community GEMPAK Change Log
 
+## Unreleased Version
+
+- Previously when building, `make` errors would not error the build.  This will
+  be changing going forward so to prevent broken builds.  The year is 2026.
+
 ## 7.20.0 (16 Jan 2026)
 
 This release merges NCEP NAWIPS 7.20.0.
diff --git a/Makefile b/Makefile
index ee98a7b6d..1e4ab19f6 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ SUBDIRS = \
 all : INSTALLDIRS
 	@for dir in $(SUBDIRS); do \
 	   ( cd $$dir; echo "Making $@ in `pwd`" ; \
-		$(MAKE) $(MFLAGS) $@ ) ; \
+		$(MAKE) $(MFLAGS) $@ ) || exit $$?; \
 	done
 
 All : all
@@ -71,7 +71,7 @@ install : INSTALLDIRS
 			NODIR) ;; \
 			*) if [ -d $$dir ]; then \
 				(cd $$dir; echo "Making $@ in `pwd`" ; \
-				$(MAKE) $(MFLAGS) $@) ; \
+				$(MAKE) $(MFLAGS) $@) || exit $$?; \
 			   else \
 				echo "Skipping $$dir"; \
 			   fi; \
@@ -85,7 +85,7 @@ install : INSTALLDIRS
 			NODIR) ;; \
 			*) if [ -d $$dir ]; then \
 				(cd $$dir; echo "Making $@ in `pwd`" ; \
-				$(MAKE) $(MFLAGS) $@) ; \
+				$(MAKE) $(MFLAGS) $@) || exit $$?; \
 			   else \
 				echo "Skipping $$dir"; \
 			   fi; \
@@ -101,7 +101,7 @@ clean:
 			NODIR) ;; \
 			*) if [ -d $$dir ]; then \
 				(cd $$dir; echo "Making $@ in `pwd`" ; \
-				$(MAKE) $(MFLAGS) $@) ; \
+				$(MAKE) $(MFLAGS) $@) || exit $$?; \
 			   else \
 				echo "Skipping $$dir"; \
 			   fi; \
diff --git a/build/DEBIAN/control b/build/DEBIAN/control
index 883828ce1..2b229d2f7 100644
--- a/build/DEBIAN/control
+++ b/build/DEBIAN/control
@@ -3,5 +3,5 @@ Version: 7.20.0
 Maintainer: Daryl Herzmann
 Architecture: all
 Description: Unidata GEMPAK Distribution
-Depends: libgfortran3, libx11-6, libxm4, libxtst6, libxt6
+Depends: libgfortran5 | libgfortran4 | libgfortran3, libx11-6, libxm4, libxtst6, libxt6
 Homepage: https://www.unidata.ucar.edu/software/gempak/
diff --git a/build/Installer.gempak/fedora.spec b/build/Installer.gempak/fedora.spec
index ec4f2213b..c97cdd8f0 100644
--- a/build/Installer.gempak/fedora.spec
+++ b/build/Installer.gempak/fedora.spec
@@ -54,6 +54,7 @@ rm -rf Makeinc.linux64_gfortran
 ln -s Makeinc.linux64_gfortran_fedora Makeinc.linux64_gfortran
 popd
 
+make extlibs #>& make.extlibs
 make gempak #>& make.gempak
 make install >& /dev/null
 make programs_gf >& /dev/null
diff --git a/build/Installer.gempak/gempak.spec b/build/Installer.gempak/gempak.spec
index cf9ec90b2..cb5e39c12 100644
--- a/build/Installer.gempak/gempak.spec
+++ b/build/Installer.gempak/gempak.spec
@@ -42,17 +42,19 @@ tar -xvzf /tmp/rpmbuild/SOURCES/gempak-%{version}.tar.gz -C %{prefix}/ >& /dev/n
 
 %install
 # create build root directory
+set -ex
 pushd %{gem_home}
 export NAWIPS=`pwd`
 cat source_python.sh
 cat source_python.sh >> build/Installer.gempak/Gemenviron.profile
 . build/Installer.gempak/Gemenviron.profile
 # TODO: ". source_python.sh" doesn't seem to work from spec file
+make extlibs #>& make.extlibs
 make gempak #>& make.gempak
-make install >& /dev/null
-make programs_gf >& /dev/null
-make programs_nc >& /dev/null
-make clean >& /dev/null
+make install
+make programs_gf
+make programs_nc
+make clean
 
 #grep -i error make.gempak
 #rm -rf make.gempak
diff --git a/build/build_centos.sh b/build/build_almalinux.sh
similarity index 78%
rename from build/build_centos.sh
rename to build/build_almalinux.sh
index ac2c28f72..8f63fbf1a 100755
--- a/build/build_centos.sh
+++ b/build/build_almalinux.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -xe
 
-# runs on centos7, so no dnf
-yum -y -q install make gcc-gfortran git rpm-build byacc flex libX11-devel libXext libXft-devel libXp-devel libXt-devel libXtst-devel openmotif-devel xorg-x11-xbitmaps autoconf libtool automake
+dnf -y -q install make gcc-gfortran gcc-c++ git rpm-build byacc flex libX11-devel libXext libXft-devel libXp-devel libXt-devel libXtst-devel openmotif-devel xorg-x11-xbitmaps autoconf libtool automake libxml2-devel libxslt-devel
 
 useradd gempak
 
diff --git a/build/build_ubuntu.sh b/build/build_ubuntu.sh
index 9ea4b51d3..d3e30575f 100755
--- a/build/build_ubuntu.sh
+++ b/build/build_ubuntu.sh
@@ -1,10 +1,20 @@
 #!/bin/sh -xe
 ls -l /home
 
+export DEBIAN_FRONTEND=noninteractive
+apt-get update -y
+apt-get install -y --no-install-recommends \
+	git gcc gfortran build-essential \
+	libx11-dev libxt-dev libxext-dev libxft-dev libxtst-dev \
+	flex byacc libmotif-common libmotif-dev libxpm4 libxpm-dev \
+	dpkg-dev ca-certificates
+
 # Package GEMPAK source from HEAD
 pushd /gempak
 package_version=`grep "define version" build/Installer.gempak/gempak.spec | grep -v version_core| awk '{print $3}'`
-git archive --format=tar --prefix=gempak-${package_version}/ HEAD  | gzip >/tmp/gempak-${package_version}.tar.gz
+git config --global --add safe.directory /gempak
+git archive --format=tar --prefix=gempak-${package_version}/ -o /tmp/gempak-${package_version}.tar HEAD
+gzip -f /tmp/gempak-${package_version}.tar
 
 # Prepare the environment
 mkdir -p /tmp/gempak-${package_version}/
@@ -12,16 +22,22 @@ mkdir -p /tmp/gempak-${package_version}/
 cp -r /gempak/build/DEBIAN /tmp/gempak-${package_version}/
 
 mkdir -p /home/gempak/
+srcdir=$(tar -tzf /tmp/gempak-${package_version}.tar.gz | awk -F/ 'NF>1{print $1; exit}')
+if [ -z "$srcdir" ]; then
+	echo "Failed to determine top-level source directory from /tmp/gempak-${package_version}.tar.gz" >&2
+	exit 1
+fi
 tar -xvzf /tmp/gempak-${package_version}.tar.gz -C /home/gempak >& /dev/null
+rm -rf /home/gempak/GEMPAK7
+mv "/home/gempak/${srcdir}" /home/gempak/GEMPAK7
 pushd /home/gempak
-mv gempak-${package_version} GEMPAK7
 cd GEMPAK7
 . Gemenviron.profile
-export PYINC="-I/usr/include/python2.7"
-export PYLIB="-lpython2.7"
-export WITHPY="-DWITHPYTHON"
-export PYDEP="-lpthread -lutil -ldl"
-export LDFLAGS="-L/usr/lib -L$OS_LIB -s"
+export PYINC=""
+export PYLIB=""
+export WITHPY=""
+export PYDEP=""
+export LDFLAGS="-L$OS_LIB -s"
 
 pushd config
 rm -rf Makeinc.linux64_gfortran
@@ -61,4 +77,4 @@ cp gempak-${package_version}.deb /gempak/build/dist/
 # Confirm install with dependencies
 apt-get update -y
 dpkg -i gempak-${package_version}.deb
-apt-get -f install
+apt-get -f install -y
diff --git a/build/setup.sh b/build/setup.sh
index e9838c5d4..d333b92c6 100755
--- a/build/setup.sh
+++ b/build/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -xe
-# ./setup.sh centos 7
-# ./setup.sh centos stream8
-# ./setup.sh centos stream9
+# ./setup.sh almalinux 9
+# ./setup.sh almalinux 10
 # ./setup.sh fedora latest
 # ./setup.sh ubuntu latest
 
@@ -9,29 +8,41 @@ os_type=$1
 os_version=$2
 TAG=${os_type}${os_version}
 
+if [ -z "$os_type" ] || [ -z "$os_version" ]; then
+    echo "Usage: $0 <dev|almalinux|ubuntu|fedora> <version>" >&2
+    exit 2
+fi
+
  # Run builds in Container
 
 if [ "$os_type" = "dev" ]; then
-	
-	# sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" -v /awips2/repo/${dn}:/awips2/repo/${dn} $imgname:$imgvers-$os_version
-        sudo docker run -v `pwd`:/gempak:rw unidata/gempak-devel:centos6 /bin/bash -c "bash -xe /gempak/build/build_dev.sh"
 
-elif [ "$os_type" = "centos" ]; then
+    # sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" -v /awips2/repo/${dn}:/awips2/repo/${dn} $imgname:$imgvers-$os_version
+    sudo docker run -v `pwd`:/gempak:rw unidata/gempak-devel:centos6 /bin/bash -c "bash -xe /gempak/build/build_dev.sh"
+
+elif [ "$os_type" = "almalinux" ]; then
 
-        sudo docker run --privileged -d -ti -e "container=docker" -v `pwd`:/gempak:rw quay.io/centos/centos:$os_version /bin/bash
-        DOCKER_CONTAINER_ID=$(sudo docker ps | grep ${os_version} | awk '{print $1}' | head -1 )
+    CONTAINER_IMAGE=quay.io/almalinuxorg/${os_version}-base
+    BUILD_SCRIPT=build_almalinux.sh
+
+    DOCKER_CONTAINER_ID=$(sudo docker run --privileged -d -ti -e "container=docker" -v `pwd`:/gempak:rw $CONTAINER_IMAGE /bin/bash)
         sudo docker logs $DOCKER_CONTAINER_ID
-        sudo docker exec --tty $DOCKER_CONTAINER_ID /bin/bash -xec "bash -xe /gempak/build/build_${os_type}.sh ${os_version}";
+        sudo docker exec --tty $DOCKER_CONTAINER_ID /bin/bash -xec "bash -xe /gempak/build/${BUILD_SCRIPT} ${os_version}";
         sudo docker ps -a
         sudo docker stop $DOCKER_CONTAINER_ID
         sudo docker rm -v $DOCKER_CONTAINER_ID
 
 elif [ "$os_type" = "ubuntu" ]; then
 
-    sudo docker run --rm=true -v `pwd`:/gempak:rw unidata/gempak-devel:$os_type /bin/bash -c "bash -xe /gempak/build/build_${os_type}.sh "
+    sudo docker run --rm=true -v `pwd`:/gempak:rw ubuntu:${os_version} /bin/bash -c "bash -xe /gempak/build/build_${os_type}.sh "
 
 elif [ "$os_type" = "fedora" ]; then
 
     sudo docker run --rm=true -v `pwd`:/gempak:rw unidata/gempak-devel:$os_type /bin/bash -c "bash -xe /gempak/build/build_${os_type}.sh"
 
+else
+
+    echo "Unsupported os_type '$os_type'. Expected one of: dev, almalinux, ubuntu, fedora." >&2
+    exit 2
+
 fi
diff --git a/config/Makeinc.common_linux b/config/Makeinc.common_linux
index 536df3770..37bd643d8 100644
--- a/config/Makeinc.common_linux
+++ b/config/Makeinc.common_linux
@@ -88,7 +88,7 @@ UTF              = $(OS_LIB)/utf.a
 X11LIB           = -lX11
 GUILIBS          = $(MOTIFLIBS) $(X11LIBDIR) -lXt -lX11 -lz
 NETCDFINC        = $(OS_INC)
-NETCDF           = $(OS_LIB)/libnetcdf.a -ldl -lz $(OS_LIB)/libhdf5_hl.a $(OS_LIB)/libhdf5.a
+NETCDF           = $(OS_LIB)/libnetcdf.a $(OS_LIB)/libhdf5_hl.a $(OS_LIB)/libhdf5.a -ldl -lz
 
 ZLIB             = $(OS_LIB)/libz.a
 ZLIBINC          = $(OS_INC)
diff --git a/config/Makeinc.linux64_gfortran b/config/Makeinc.linux64_gfortran
index 0b3694f24..2430078fb 100644
--- a/config/Makeinc.linux64_gfortran
+++ b/config/Makeinc.linux64_gfortran
@@ -9,7 +9,9 @@ MOTIFINC  = -I/usr/X11R6/include
 XWINCDIR  = -I/usr/X11R6/include
 
 COPT = -DUNDERSCORE -D$(OPSYS) $(GEMINC) $(MOTIFINC) $(PYINC) $(WITHPY) -DG_64BIT -g -O2 -fPIC
-FOPT = -fallow-invalid-boz -fallow-argument-mismatch -fno-second-underscore -fno-range-check -fd-lines-as-comments $(GEMINC) -g -O
+FALLOW_INVALID_BOZ = $(shell tmpf=$$(mktemp /tmp/gfboz-XXXXXX.f 2>/dev/null || echo /tmp/gfboz-$$$$.f); objf=$${tmpf%.f}.o; printf "      end\n" > $$tmpf; if $(FC) -fallow-invalid-boz -c $$tmpf -o $$objf >/dev/null 2>&1; then echo -fallow-invalid-boz; fi; rm -f $$tmpf $$objf)
+FALLOW_ARG_MISMATCH = $(shell tmpf=$$(mktemp /tmp/gfarg-XXXXXX.f 2>/dev/null || echo /tmp/gfarg-$$$$.f); objf=$${tmpf%.f}.o; printf "      end\n" > $$tmpf; if $(FC) -fallow-argument-mismatch -c $$tmpf -o $$objf >/dev/null 2>&1; then echo -fallow-argument-mismatch; fi; rm -f $$tmpf $$objf)
+FOPT = $(FALLOW_INVALID_BOZ) $(FALLOW_ARG_MISMATCH) -fno-second-underscore -fno-range-check -fd-lines-as-comments $(GEMINC) -g -O
 NCII = "-I../libsrc"
 NCOPT = "CPPFLAGS=-DNDEBUG -Df2cFortran -I$(OS_INC)" "FFLAGS=-O -Wno-globals" "CFLAGS=-O $(NCII)" "CXX= "
 JASPEROPT = 'CC=$(CC)' 'CFLAGS=-O' '--disable-libjpeg'
diff --git a/config/Makeinc.linux64_gfortran_ubuntu b/config/Makeinc.linux64_gfortran_ubuntu
index 358dd4501..a6a3410dd 100644
--- a/config/Makeinc.linux64_gfortran_ubuntu
+++ b/config/Makeinc.linux64_gfortran_ubuntu
@@ -9,7 +9,9 @@ MOTIFINC  = -I/usr/X11R6/include
 XWINCDIR  = -I/usr/X11R6/include
 
 COPT = -fno-stack-protector -DUNDERSCORE -D$(OPSYS) $(GEMINC) $(MOTIFINC) $(PYINC) $(WITHPY) -DG_64BIT -g -O2
-FOPT = -fno-stack-protector -fno-second-underscore -fno-range-check -fd-lines-as-comments $(GEMINC) -g -O
+FALLOW_INVALID_BOZ = $(shell tmpf=$$(mktemp /tmp/gfboz-XXXXXX.f 2>/dev/null || echo /tmp/gfboz-$$$$.f); objf=$${tmpf%.f}.o; printf "      end\n" > $$tmpf; if $(FC) -fallow-invalid-boz -c $$tmpf -o $$objf >/dev/null 2>&1; then echo -fallow-invalid-boz; fi; rm -f $$tmpf $$objf)
+FALLOW_ARG_MISMATCH = $(shell tmpf=$$(mktemp /tmp/gfarg-XXXXXX.f 2>/dev/null || echo /tmp/gfarg-$$$$.f); objf=$${tmpf%.f}.o; printf "      end\n" > $$tmpf; if $(FC) -fallow-argument-mismatch -c $$tmpf -o $$objf >/dev/null 2>&1; then echo -fallow-argument-mismatch; fi; rm -f $$tmpf $$objf)
+FOPT = -fno-stack-protector -fno-second-underscore -fno-range-check -fd-lines-as-comments $(FALLOW_INVALID_BOZ) $(FALLOW_ARG_MISMATCH) $(GEMINC) -g -O
 NCII = "-I../libsrc"
 NCOPT = "CPPFLAGS=-DNDEBUG -Df2cFortran -I$(OS_INC)" "FFLAGS=-O -Wno-globals" "CFLAGS=-O $(NCII)" "CXX= "
 JASPEROPT = 'CC=$(CC)' 'CFLAGS=-O' '--disable-libjpeg'
diff --git a/extlibs/AODT/Makefile b/extlibs/AODT/Makefile
index ec71f26b4..5855b2db6 100644
--- a/extlibs/AODT/Makefile
+++ b/extlibs/AODT/Makefile
@@ -15,17 +15,17 @@ SUBDIRS = \
 
 all : INCDIR
 	@for dir in $(SUBDIRS); do \
-	   ( cd $$dir; pwd; $(MAKE) $(MFLAGS) $@ ) ; \
+	   ( cd $$dir; pwd; $(MAKE) $(MFLAGS) $@ ) || exit $$?; \
 	done
 
 install:
 	@for dir in $(SUBDIRS); do \
-	   (cd $$dir; pwd; $(MAKE) $(MFLAGS) $@ ) ; \
+	   (cd $$dir; pwd; $(MAKE) $(MFLAGS) $@ ) || exit $$?; \
 	done
 
 clean:
 	@for dir in $(SUBDIRS); do \
-	   (cd $$dir; pwd; $(MAKE) $(MFLAGS) $@ ) ; \
+	   (cd $$dir; pwd; $(MAKE) $(MFLAGS) $@ ) || exit $$?; \
 	done
 
 programs_nc:
diff --git a/extlibs/HDF5/Makefile b/extlibs/HDF5/Makefile
index 4089e2454..451c00448 100644
--- a/extlibs/HDF5/Makefile
+++ b/extlibs/HDF5/Makefile
@@ -1,5 +1,8 @@
 include $(CONFIGDIR)/$(MAKEINC)
 
+HDF5_CFLAGS = -O2 -w
+HDF5_CPPFLAGS = -w
+
 
 all: $(OS_LIB)/libhdf5.a
 
@@ -10,11 +13,11 @@ $(OS_LIB)/libhdf5.a:
 	$(MAKE) _lhdf5 $(HDFOPT)
 
 _lhdf5: INSTALLDIR
-	-@cd libhdf; \
+	@cd libhdf; \
 	pwd; \
-	$(MAKE) distclean ; \
-	./configure '--prefix=$(OS_ROOT)' '--with-zlib=$(OS_ROOT)' --disable-debug --disable-trace ; \
-	$(MAKE) all install
+	if [ -f Makefile ]; then $(MAKE) distclean ; fi ; \
+	./configure '--prefix=$(OS_ROOT)' '--with-zlib=$(OS_ROOT)' --disable-debug --disable-trace 'CFLAGS=$(HDF5_CFLAGS)' 'CPPFLAGS=$(HDF5_CPPFLAGS)' ; \
+	$(MAKE) -s all install
 
 INSTALLDIR:
 	@echo " Creating $(OS_ROOT)"
diff --git a/extlibs/Makefile b/extlibs/Makefile
index 11f533f1f..ea9ec3835 100644
--- a/extlibs/Makefile
+++ b/extlibs/Makefile
@@ -29,7 +29,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -38,20 +38,14 @@ programs_nc :
 programs_gf : 
 
 install:
-	@for dir in NODIR $(SUBDIRS); do \
-		case $$dir in \
-			NODIR) ;; \
-			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
-		esac ; \
-	done
+	@echo "Nothing to install in extlibs (handled during 'all')"
 
 clean: 
 	@for dir in NODIR $(SUBDIRS); do \
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/extlibs/NDFD/Makefile b/extlibs/NDFD/Makefile
index 13a364c9e..9d005e54e 100644
--- a/extlibs/NDFD/Makefile
+++ b/extlibs/NDFD/Makefile
@@ -12,7 +12,7 @@ SUBDIRS = \
 all :
 	@for dir in $(SUBDIRS) ; do \
 	   (cd $$dir; echo "making $@ in `pwd` " ; \
-		$(MAKE) $(MFLAGS) $@) ; $(ARSLEEP) \
+		$(MAKE) $(MFLAGS) $@) || exit $$?; $(ARSLEEP) \
 	done
 
 install :
@@ -20,5 +20,5 @@ install :
 clean:
 	@for dir in $(SUBDIRS) ; do \
 	   (cd $$dir; echo "making $@ in `pwd` " ; \
-		$(MAKE) $(MFLAGS) $@) ; \
+		$(MAKE) $(MFLAGS) $@) || exit $$?; \
 	done
diff --git a/extlibs/ncepBUFR/Makefile b/extlibs/ncepBUFR/Makefile
index 273bb7973..c5bca60d7 100644
--- a/extlibs/ncepBUFR/Makefile
+++ b/extlibs/ncepBUFR/Makefile
@@ -10,11 +10,11 @@ SUBDIRS = libncepBUFR
 all :
 	@for dir in $(SUBDIRS); do \
 	   ( cd $$dir; echo "making $@ in `pwd`" ; \
-		$(MAKE) $(MFLAGS) $@ ) ; \
+		$(MAKE) $(MFLAGS) $@ ) || exit $$?; \
 	done
 
 clean:
 	@for dir in $(SUBDIRS); do \
 	( cd libncepBUFR; echo "making $@ in `pwd`" ; \
-		$(MAKE) $(MFLAGS) $@ ) ; \
+		$(MAKE) $(MFLAGS) $@ ) || exit $$?; \
 	done
diff --git a/extlibs/netCDF/Makefile b/extlibs/netCDF/Makefile
index e49393e9c..eaa18f438 100644
--- a/extlibs/netCDF/Makefile
+++ b/extlibs/netCDF/Makefile
@@ -1,6 +1,9 @@
 include $(CONFIGDIR)/$(MAKEINC)
 include makefile.common
 
+NETCDF_CFLAGS = -O2 -w
+NETCDF_CPPFLAGS = -I$(OS_INC) -w
+
 NETCDF            = $(OS_LIB)/libnetcdf.a
 
 
@@ -10,15 +13,16 @@ install:
 
 $(NETCDF):
 	@echo look netcdf $(NETCDF)
-	$(MAKE) lnetcdf $(NCOPT) $(NCENV)
+	$(MAKE) lnetcdf $(NCOPT) $(NCENV) || exit $$?
 
 lnetcdf: INSTALLDIR
-	-@cd netcdf; \
+	@cd netcdf; \
 	pwd; \
 	touch macros.make; \
-	$(MAKE) distclean ; \
-	./configure --disable-dap '--prefix=$(OS_ROOT)'; \
-	$(MAKE) all install
+	if [ -f Makefile ]; then $(MAKE) distclean ; fi ; \
+	./configure --disable-dap '--prefix=$(OS_ROOT)' 'CFLAGS=$(NETCDF_CFLAGS)' 'CPPFLAGS=$(NETCDF_CPPFLAGS)'; \
+	$(MAKE) -s all install
+	@test -f $(OS_INC)/netcdf.h || (echo "ERROR: expected $(OS_INC)/netcdf.h after netCDF install" >&2; exit 1)
 
 INSTALLDIR:
 	@echo " Creating $(OS_ROOT)"
diff --git a/extlibs/rsl/Makefile b/extlibs/rsl/Makefile
index bfe4ddd65..a1458bc02 100644
--- a/extlibs/rsl/Makefile
+++ b/extlibs/rsl/Makefile
@@ -9,13 +9,13 @@ SUBDIRS = \
 
 all :
 	@for dir in $(SUBDIRS); do \
-	   cd $$dir; pwd; $(MAKE) $(MFLAGS) $@; \
+	   cd $$dir; pwd; $(MAKE) $(MFLAGS) $@ || exit $$?; \
 	done
 
 install:
 
 clean:
 	@for dir in $(SUBDIRS); do \
-	   cd $$dir; pwd; $(MAKE) $(MFLAGS) $@; \
+	   cd $$dir; pwd; $(MAKE) $(MFLAGS) $@ || exit $$?; \
 	done
 
diff --git a/extlibs/xslt/Makefile b/extlibs/xslt/Makefile
index e3f4f06aa..b67a5b2b7 100644
--- a/extlibs/xslt/Makefile
+++ b/extlibs/xslt/Makefile
@@ -8,9 +8,8 @@ $(OS_LIB)/libxslt.a:
 
 _xslt: clean INSTALLDIR 
 	@(cd libxslt; echo "Making in `pwd`"; \
-	( autoreconf --force --install || touch * ); \
 	./configure '--prefix=$(OS_ROOT)' --disable-shared --without-debug --without-debugger '--with-libxml-prefix=$(OS_ROOT)' 'CC=$(CC)' ; \
-	$(MAKE) install )
+	$(MAKE) all install man_MANS= MANS= )
 
 INSTALLDIR:
 	@echo " Creating $(OS_ROOT)"
diff --git a/extlibs/zlib/Makefile b/extlibs/zlib/Makefile
index cb8183ea3..40c1ff567 100644
--- a/extlibs/zlib/Makefile
+++ b/extlibs/zlib/Makefile
@@ -12,12 +12,12 @@ install: all
 clean: _zlib_clean
 
 $(ZLIB):
-	( cd zlib; echo "making $@ in `pwd`" ; \
-		make -s distclean ; \
+	( set -e; cd zlib; echo "making $@ in `pwd`"; \
+		if [ -f Makefile ]; then $(MAKE) -s distclean; fi; \
 		( autoreconf --force --install || touch * ); \
 		./configure --static -s --prefix=$(OS_ROOT); \
-		make -s all install ; \
-		make -s distclean )
+		$(MAKE) -s all install; \
+		$(MAKE) -s distclean )
 
 _zlib: $(ZLIB)
 
diff --git a/gempak/Makefile b/gempak/Makefile
index d3c5a44a5..fb4eb49bc 100644
--- a/gempak/Makefile
+++ b/gempak/Makefile
@@ -15,7 +15,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -24,7 +24,7 @@ programs_nc :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_nc in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -33,7 +33,7 @@ programs_gf :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_gf in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -44,7 +44,7 @@ FORCEinstall :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) install) ;; \
+				pwd ; $(MAKE) $(MFLAGS) install) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -53,7 +53,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/Makefile b/gempak/source/Makefile
index 148ceb5a1..b12edca00 100644
--- a/gempak/source/Makefile
+++ b/gempak/source/Makefile
@@ -40,7 +40,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done \
 	;;\
@@ -49,7 +49,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo "Making $@ in `pwd`" ; \
-				$(MAKE) $(MFLAGS) $@) ;; \
+				$(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done \
 	;; \
@@ -68,7 +68,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -77,7 +77,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/diaglib/df/Makefile b/gempak/source/diaglib/df/Makefile
index 9f29b1a0d..75e1d5d17 100644
--- a/gempak/source/diaglib/df/Makefile
+++ b/gempak/source/diaglib/df/Makefile
@@ -67,6 +67,7 @@ COBJS = \
 	$(ALIB)(dflt.o) \
 	$(ALIB)(dfmask.o) \
 	$(ALIB)(dfmass.o) \
+	$(ALIB)(dfmfrq.o) \
 	$(ALIB)(dfmiss.o) \
 	$(ALIB)(dfmixr.o) \
 	$(ALIB)(dfmul.o) \
diff --git a/gempak/source/diaglib/pd/Makefile b/gempak/source/diaglib/pd/Makefile
index 12c7fadff..bbdb735c1 100644
--- a/gempak/source/diaglib/pd/Makefile
+++ b/gempak/source/diaglib/pd/Makefile
@@ -22,6 +22,7 @@ COBJS = \
 	$(ALIB)(pdinmm.o) \
 	$(ALIB)(pdkinx.o) \
 	$(ALIB)(pdknms.o) \
+	$(ALIB)(pdmfrq.o) \
 	$(ALIB)(pdmixr.o) \
 	$(ALIB)(pdmmin.o) \
 	$(ALIB)(pdmskn.o) \
diff --git a/gempak/source/driver/active/Makefile b/gempak/source/driver/active/Makefile
index 4093c8cda..3035fac6f 100644
--- a/gempak/source/driver/active/Makefile
+++ b/gempak/source/driver/active/Makefile
@@ -26,7 +26,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "$(OS) making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ;  \
 	done
 
@@ -38,7 +38,7 @@ install :
 		case $$dir in \
 		NODIR) ;; \
 		*) (cd $$dir; echo -n "$(OS) installing in " ; \
-			pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+			pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ;  \
 	done
 
@@ -47,7 +47,7 @@ clean:
 		case $$dir in \
 		NODIR) ;; \
 		*) (cd $$dir; echo -n "$(OS) making clean in " ; \
-			pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+			pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ;  \
 	done
 
diff --git a/gempak/source/programs/dc/Makefile b/gempak/source/programs/dc/Makefile
index 49ba2c6dd..11d77b4cb 100644
--- a/gempak/source/programs/dc/Makefile
+++ b/gempak/source/programs/dc/Makefile
@@ -58,7 +58,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -74,7 +74,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -83,7 +83,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/programs/dc/dcgrib/Makefile b/gempak/source/programs/dc/dcgrib/Makefile
index 4e528b261..13f31caa8 100644
--- a/gempak/source/programs/dc/dcgrib/Makefile
+++ b/gempak/source/programs/dc/dcgrib/Makefile
@@ -63,11 +63,16 @@ $(MANDIR)/man1/$(PROG).1 : $(PROG).1
 	-@cmp -s $? $@ || \
 		($(AUXINSTALL) $? $@ && echo 'updated $@')
 
-nacmn.cmn: 
-	-$(LN) $(GEMPAK)/source/griblib/na/nacmn.cmn .
+nacmn.cmn:
+	@$(RM) -f $@
+	$(LN) $(GEMPAK)/source/griblib/na/nacmn.cmn $@
 
 gbcmn.h:
-	-$(LN) $(GEMPAK)/source/griblib/gb/gbcmn.h .
+	@$(RM) -f $@
+	$(LN) $(GEMPAK)/source/griblib/gb/gbcmn.h $@
+
+put_gem_grid.o: nacmn.cmn
+gemgds.o gempds.o stagger_e.o: gbcmn.h
 
 $(PROG) : $(SYMLINKS) nacmn.cmn gbcmn.h $(PROG_OBJS)
 	$(LINK.f) $(NOFORMAIN) -o $@ \
diff --git a/gempak/source/programs/dc/dcgrib/gbcmn.h b/gempak/source/programs/dc/dcgrib/gbcmn.h
deleted file mode 120000
index 5a67455a6..000000000
--- a/gempak/source/programs/dc/dcgrib/gbcmn.h
+++ /dev/null
@@ -1 +0,0 @@
-/home/gempak/GEMPAK7/gempak/source/griblib/gb/gbcmn.h
\ No newline at end of file
diff --git a/gempak/source/programs/dc/dcgrib/nacmn.cmn b/gempak/source/programs/dc/dcgrib/nacmn.cmn
deleted file mode 120000
index 11fe20244..000000000
--- a/gempak/source/programs/dc/dcgrib/nacmn.cmn
+++ /dev/null
@@ -1 +0,0 @@
-/home/gempak/GEMPAK7/gempak/source/griblib/na/nacmn.cmn
\ No newline at end of file
diff --git a/gempak/source/programs/dc/dcuair/dcudcd.f b/gempak/source/programs/dc/dcuair/dcudcd.f
index 49a1d704e..30a72e2b1 100644
--- a/gempak/source/programs/dc/dcuair/dcudcd.f
+++ b/gempak/source/programs/dc/dcuair/dcudcd.f
@@ -242,12 +242,12 @@ SUBROUTINE DCUDCD ( curtim, gemfil, stntbl, iadstn, maxtim,
 C*                              the TTBB message, still decode the following
 C*                              PPBB winds.
 C
-								ipres =  INDEX ( bultin ( 1: lenbul ), '21212' )
-								IF  ( ipres .ne. 0 )  THEN
-									IF ( part .eq.  'PPBB' )  THEN
-                                                                           IF ( .not.  zwind ) good  = .true.
-                                                                        END IF
-								END IF
+					ipres = INDEX ( bultin ( 1:lenbul ), '21212' )
+					IF ( ipres .ne. 0 ) THEN
+					    IF ( part .eq. 'PPBB' ) THEN
+						IF ( .not. zwind ) good = .true.
+					    END IF
+					END IF
 			    END IF
 			    IF ( good ) THEN
 C
diff --git a/gempak/source/programs/gd/Makefile b/gempak/source/programs/gd/Makefile
index e905928c4..f0b99a58c 100644
--- a/gempak/source/programs/gd/Makefile
+++ b/gempak/source/programs/gd/Makefile
@@ -50,7 +50,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -60,7 +60,7 @@ programs_nc:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_nc in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -69,7 +69,7 @@ programs_gf:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_gf in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -78,7 +78,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -87,7 +87,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/programs/gp/Makefile b/gempak/source/programs/gp/Makefile
index b04b8e734..714001362 100644
--- a/gempak/source/programs/gp/Makefile
+++ b/gempak/source/programs/gp/Makefile
@@ -21,7 +21,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -31,7 +31,7 @@ programs_nc:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_nc in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -40,7 +40,7 @@ programs_gf:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_gf in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -49,7 +49,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -58,7 +58,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/programs/gui/Makefile b/gempak/source/programs/gui/Makefile
index 07a308b98..d5f73f4e6 100644
--- a/gempak/source/programs/gui/Makefile
+++ b/gempak/source/programs/gui/Makefile
@@ -19,7 +19,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -35,7 +35,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -44,7 +44,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/programs/na/Makefile b/gempak/source/programs/na/Makefile
index e1c956f6f..6ada7046c 100644
--- a/gempak/source/programs/na/Makefile
+++ b/gempak/source/programs/na/Makefile
@@ -15,7 +15,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -31,7 +31,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -40,7 +40,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/programs/oa/Makefile b/gempak/source/programs/oa/Makefile
index 8cb94fc50..369ad15d1 100644
--- a/gempak/source/programs/oa/Makefile
+++ b/gempak/source/programs/oa/Makefile
@@ -14,7 +14,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -30,7 +30,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -39,7 +39,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/programs/sf/Makefile b/gempak/source/programs/sf/Makefile
index afca5ec1e..7a3500298 100644
--- a/gempak/source/programs/sf/Makefile
+++ b/gempak/source/programs/sf/Makefile
@@ -25,7 +25,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -35,7 +35,7 @@ programs_nc:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_nc in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -44,7 +44,7 @@ programs_gf:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_gf in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -53,7 +53,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -62,7 +62,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/programs/sn/Makefile b/gempak/source/programs/sn/Makefile
index c25fbf250..8814243c4 100644
--- a/gempak/source/programs/sn/Makefile
+++ b/gempak/source/programs/sn/Makefile
@@ -24,7 +24,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -34,7 +34,7 @@ programs_nc:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_nc in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -43,7 +43,7 @@ programs_gf:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making programs_gf in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -52,7 +52,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -61,7 +61,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/source/programs/util/Makefile b/gempak/source/programs/util/Makefile
index 7b678b326..3d3f241c5 100644
--- a/gempak/source/programs/util/Makefile
+++ b/gempak/source/programs/util/Makefile
@@ -54,7 +54,7 @@ all :
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "making in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -70,7 +70,7 @@ install:
 		case $$dir in \
 			NODIR) ;; \
 			*) (cd $$dir; echo -n "installing in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
@@ -79,7 +79,7 @@ clean:
 		case $$dir in \
 			NODIR) ;; \
 		*) (cd $$dir; echo -n "making clean in " ; \
-				pwd ; $(MAKE) $(MFLAGS) $@) ;; \
+				pwd ; $(MAKE) $(MFLAGS) $@) || exit $$? ;; \
 		esac ; \
 	done
 
diff --git a/gempak/utilities/tca2xml/Makefile b/gempak/utilities/tca2xml/Makefile
new file mode 100644
index 000000000..b9707b434
--- /dev/null
+++ b/gempak/utilities/tca2xml/Makefile
@@ -0,0 +1,8 @@
+all:
+	@echo "Nothing to make for tca2xml"
+
+install:
+	@echo "Nothing to install for tca2xml"
+
+clean:
+	@echo "Nothing to clean for tca2xml"
diff --git a/scripts/decoder/xml2gairm4nmap.py b/scripts/decoder/xml2gairm4nmap.py
index 01a21ab97..77165d7be 100755
--- a/scripts/decoder/xml2gairm4nmap.py
+++ b/scripts/decoder/xml2gairm4nmap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 from __future__ import print_function
 import argparse
diff --git a/source_python.sh b/source_python.sh
index 6509a52e4..30f2e7f3b 100644
--- a/source_python.sh
+++ b/source_python.sh
@@ -7,8 +7,18 @@ if [ -d "/awips2/python" ]; then
     pv="`${PYHOME}/bin/python -V 2>&1 | cut -c8- | cut -d. -f1`"
     pr="`${PYHOME}/bin/python -V 2>&1 | cut -c8- | cut -d. -f2`"
     export PYTHONPATH="${PYHOME}/lib/python${pv}.${pr}/site-packages:${NAWIPS}/scripts/python"
+    export PYINC="-I${PYHOME}/include/python${pv}.${pr}"
+    export PYLIB="-lpython${pv}.${pr}"
+    export WITHPY="-DWITHPYTHON"
+    export PYDEP="-lpthread -ldl -lutil"
+    export LDFLAGS="-L${PYHOME}/lib -L$OS_LIB -s"
 else
     export PYTHONPATH="${NAWIPS}/scripts/python:${PYTHONPATH}"
+    export PYINC=""
+    export PYLIB=""
+    export WITHPY=""
+    export PYDEP=""
+    export LDFLAGS="-L$OS_LIB -s"
 fi
 
 if [ ! -d $NAWIPS ] ; then
@@ -18,8 +28,3 @@ if [ ! -d $NAWIPS ] ; then
     exit
 fi
 
-export PYINC="-I${PYHOME}/include/python${pv}.${pr}"
-export PYLIB="-lpython${pv}.${pr}"
-export WITHPY="-DWITHPYTHON"
-export PYDEP="-lpthread -ldl -lutil"
-export LDFLAGS="-L${PYHOME}/lib -L$OS_LIB -s"