minor update of CREDITS to be more specific

dstndstn · Sep 9, 2015 · dd9f547 · dd9f547
1 parent 4671987
commit dd9f547
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CREDITS b/CREDITS
@@ -4,10 +4,10 @@ First, the obvious ones:
 
 -gsl-an/
   GSL (the GNU Scientific Library) v1.11
-  Licensed under the GPL, of course.
+  Licensed under the GPL v3+.
 
 -qfits-an/
-  QFITS library v6.2, licensed under the GPL.  Heavily modified by us.
+  QFITS library v6.2, licensed under the GPL v2+.  Heavily modified by us.
 
 Now, some miscellaneous files:
 
@@ -43,7 +43,7 @@ Now, some miscellaneous files:
   (c) Ben Weaver
 
 -blind/an_mm_malloc.h
-  (c) FSF, from GCC.  Imported for use by ctmf.c
+  (c) FSF, from GCC.  GPL v3+.  Imported for use by ctmf.c
 
 -blind/anet.py
   (c) Josh Bloom, licensed under GPL v3.

diff --git a/util/Makefile b/util/Makefile
@@ -309,6 +309,9 @@ makefile.os-features: os-features-test.c
 	@echo "---- Error messages in the next few commands are not necessarily bugs ----"
 	@echo "     (we're checking how things works on your computer)"
 	-rm -f os-features-makefile.log
+	@echo "Testing netpbm..."
+	@echo "   NETPBM_INC_ORIG is $(NETPBM_INC_ORIG)"
+	@echo "   NETPBM_LIB_ORIG is $(NETPBM_LIB_ORIG)"
 	( \
 	 echo "# This file is generated by util/Makefile."; \
 	 (($(CC) -o os-features-test-netpbm-make \