Release 10.35.68

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@989 9d0c8265-081b-0410-96cb-a4ca84ce46f8

9 files changed, 29 insertions, 13 deletions

diff --git a/Makefile.version b/Makefile.version
index 5512f749..4bb0a620 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 67
+NETPBM_POINT_RELEASE = 68
diff --git a/buildtools/configure.pl b/buildtools/configure.pl
index 4248b4c5..2f301ab7 100755
--- a/buildtools/configure.pl
+++ b/buildtools/configure.pl
@@ -1893,7 +1893,7 @@ if ($platform eq "GNU") {
         # We don't know what to do here.  We used to (before 10.20) just
         # just assume the compiler was gcc.  We know that the gcc stuff
         # above does NOT work for HP native compiler.
-        push(@config_mk, "LDSHLIB =\n");
+        push(@Makefile_config, "LDSHLIB =\n");
     }
 } elsif ($platform eq "AIX") {
     push(@Makefile_config, 'LDFLAGS = -L /usr/pubsw/lib', "\n");
diff --git a/converter/other/Makefile b/converter/other/Makefile
index 756ba8e3..8d4fcb76 100644
--- a/converter/other/Makefile
+++ b/converter/other/Makefile
@@ -215,7 +215,7 @@ install.bin.local: $(PKGDIR)/bin
 # Remember that $(SYMLINK) might just be a copy command.
 # backward compatibility: program used to be named pnmnoraw
 	cd $(PKGDIR)/bin ; \
-	$(SYMLINK) pnmtoplainpnm$(EXE) pnmnoraw
+	$(SYMLINK) pnmtoplainpnm pnmnoraw
 # backward compatibility: program used to be gemtopbm
 	cd $(PKGDIR)/bin ; \
 	$(SYMLINK) gemtopnm$(EXE) gemtopbm
diff --git a/converter/other/jpeg2000/libjasper/Makefile b/converter/other/jpeg2000/libjasper/Makefile
index ad4fbd8f..965f15ad 100644
--- a/converter/other/jpeg2000/libjasper/Makefile
+++ b/converter/other/jpeg2000/libjasper/Makefile
@@ -25,6 +25,6 @@ include $(SRCDIR)/$(SUBDIR)/Makefile.common
 # looks like dependencies were rebuilt and libjasper.a gets rebuilt every
 # time.
 libjasper.a: $(SUBDIRS:%=%/all) partlist 
-	ar rc $@ $(shell cat partlist)
+	$(AR) rc $@ $(shell cat partlist)
 	$(RANLIB) $@
 
diff --git a/converter/other/svgtopam.c b/converter/other/svgtopam.c
index a2fe9f9d..76e122db 100644
--- a/converter/other/svgtopam.c
+++ b/converter/other/svgtopam.c
@@ -189,13 +189,13 @@ destroyPath(path * const pathP) {
 
 
 typedef struct {
-    uint x;
-    uint y;
+    unsigned int x;
+    unsigned int y;
 } point;
 
 static point
-makePoint(uint const x,
-          uint const y) {
+makePoint(unsigned int const x,
+          unsigned int const y) {
 
     point p;
     
@@ -296,8 +296,8 @@ skipWhiteSpace(pathReader * const pathReaderP) {
 
 
 static void
-getNumber(pathReader * const pathReaderP,
-          uint *       const numberP) {
+getNumber(pathReader *   const pathReaderP,
+          unsigned int * const numberP) {
 
     const path * const pathP          = pathReaderP->pathP;
     const char * const pathText       = pathP->pathText;
@@ -308,7 +308,7 @@ getNumber(pathReader * const pathReaderP,
     if (pathReaderP->cursor >= pathTextLength)
         pm_error("Path description ends where a number was expected.");
     else {
-        uint number;
+        unsigned int number;
 
         number = 0;  /* initial value */
 
diff --git a/doc/HISTORY b/doc/HISTORY
index 9c823ad1..0c78323f 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,20 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+09.09.18 BJH  Release 10.35.68
+
+              pambayer: fix unconditional crash/failure when you aren't using
+              Standard Input.
+
+              Build: use AR from config.mk instead of "ar" to build static
+              libraries: libnetpbm, librle, libjasper.
+
+              Build: don't use "uint".
+
+              Package: fix installation of pnmplain on Windows (.exe suffix).
+
+              Configure: fix wrong variable name for HP-UX.
+
 09.09.03 BJH  Release 10.35.67
 
               Build: fix failure to recognize static library in omitting
diff --git a/lib/Makefile b/lib/Makefile
index bd8eccae..2d49376d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -174,7 +174,7 @@ endif
 ifeq ($(BUILD_STATICLIB),y)
 libnetpbm.$(STATICLIBSUFFIX): $(LIBOBJECTS) $(LIBOBJECTS_X)
 	-rm -f $@
-	ar rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X)
+	$(AR) rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X)
 	-$(RANLIB) $@
 endif
 
diff --git a/other/pambayer.c b/other/pambayer.c
index aa4beef1..9c58a3f4 100644
--- a/other/pambayer.c
+++ b/other/pambayer.c
@@ -79,6 +79,8 @@ parseCommandLine(int argc, char ** argv,
     else if (argc-1 > 1)
         pm_error("There is at most one argument -- the input file.  "
                  "You specified %u", argc-1);
+    else
+        cmdlineP->inputFilespec = argv[1];
 
     if (!typeSpec)
         pm_error("You must specify the -type option");
diff --git a/urt/Makefile b/urt/Makefile
index 04dd2913..17fd534b 100644
--- a/urt/Makefile
+++ b/urt/Makefile
@@ -19,7 +19,7 @@ all: librle.a
 
 librle.a: $(LIBOBJECTS)
 	rm -f $@
-	ar rc $@ $^
+	$(AR) rc $@ $^
 	$(RANLIB) $@
 
 # Rule for objects.