diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rwxr-xr-x | buildtools/stamp-date | 2 | ||||
| -rw-r--r-- | converter/ppm/ppmtoarbtxt.c | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 12 | ||||
| -rw-r--r-- | icon/Makefile | 8 | ||||
| -rw-r--r-- | version.mk | 2 |
6 files changed, 24 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index caf8e37d..ca2181b3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -74,7 +74,7 @@ include $(BUILDDIR)/config.mk PROG_SUBDIRS = converter analyzer editor generator other PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS) -SUPPORT_SUBDIRS = urt buildtools test +SUPPORT_SUBDIRS = urt icon buildtools test SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS) diff --git a/buildtools/stamp-date b/buildtools/stamp-date index 808bab79..5fb6c13a 100755 --- a/buildtools/stamp-date +++ b/buildtools/stamp-date @@ -12,7 +12,7 @@ DATE=`date` LOGNAME_OR_UNKNOWN=${LOGNAME:-UNKNOWN} USER=${USER:-$LOGNAME_OR_UNKNOWN} -if [ $USER = "UNKNOWN" ]; then +if [ "$USER" = "UNKNOWN" ]; then USER=`whoami` fi diff --git a/converter/ppm/ppmtoarbtxt.c b/converter/ppm/ppmtoarbtxt.c index 83a93441..5873761f 100644 --- a/converter/ppm/ppmtoarbtxt.c +++ b/converter/ppm/ppmtoarbtxt.c @@ -436,6 +436,7 @@ validateParsePrintfFLag(int const printfConversion, +#if HAVE_PARSE_PRINTF_FORMAT static void validateFormatWithPpf(const char * const format, SkeletonObjectType const ctyp, @@ -475,6 +476,7 @@ validateFormatWithPpf(const char * const format, break; } } +#endif diff --git a/doc/HISTORY b/doc/HISTORY index d1562648..01a90510 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,18 @@ Netpbm. CHANGE HISTORY -------------- +15.10.14 BJH Release 10.72.01 + + Build: fix undefined reference to parse_printf_format etc. on + system that doesn't have that facility. Broken in Netpbm 10.69 + (December 2014). + + Build: fix superfluous error message when USER environment + variable contains whitespace. Broken since primordial Netpbm. + + Windows build: fix bug: make clean doesn't clean icon/netpbm.o. + Broken since Netpbm 10.67 (June 2014). + 15.09.26 BJH Release 10.72.00 Add pamunlookup . diff --git a/icon/Makefile b/icon/Makefile index 2181c88b..95786c37 100644 --- a/icon/Makefile +++ b/icon/Makefile @@ -6,7 +6,13 @@ SUBDIR = buildtools VPATH = .:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/config.mk -all: netpbm.ico +.PHONY: default +default: netpbm.o + +# We must not attempt to build netpbm.o if the build system does not +# have 'windres', so our all list is empty. +.PHONY: all +all: include $(SRCDIR)/common.mk diff --git a/version.mk b/version.mk index 8ef2cb63..06fbe7f7 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 72 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |