netpbm/patches/netpbm-10.37-build.patch

- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
- Try to fix parallel building
- Make the libopt tool less 'helpful'

--- lib/Makefile
+++ lib/Makefile
@@ -249,7 +249,7 @@
 .PHONY: install.staticlib
 install.staticlib: $(PKGDIR)/link
 	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-	  $(PKGDIR)/link
+	  $(PKGDIR)/lib
 
 # Install a shared library stub -- the ".so" file used at link time to
 # prepare a program for dynamically linking a library at run time 
@@ -257,9 +257,9 @@
 install.sharedlibstub: $(PKGDIR)/link
 ifeq ($(NETPBMLIBTYPE),unixshared)
 # install the link-time (.so) links to the runtime libraries
-	cd $(PKGDIR)/link ; \
+	cd $(PKGDIR)/lib ; \
           rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
-          $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
+          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
             libnetpbm.$(NETPBMLIBSUFFIX)
 endif
 ifeq ($(NETPBMLIBTYPE),dll)
--- GNUmakefile
+++ GNUmakefile
@@ -87,6 +87,9 @@
 
 .PHONY: nonmerge
 nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
+
+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
+converter/all analyzer/all editor/all generator/all other/all: lib/all
 
 OMIT_CONFIG_RULE = 1
 include $(SRCDIR)/Makefile.common
--- buildtools/libopt.c
+++ buildtools/libopt.c
@@ -502,7 +502,7 @@
 
     strcpy(outputLine, "");  /* initial value */
     runtime = FALSE;  /* initial value */
-    quiet = FALSE;   /* initial value */
+    quiet = TRUE;   /* initial value */
     error = FALSE;  /* no error yet */
     for (arg = 1; arg < argc && !error; arg++) {
         if (strcmp(argv[arg], "-runtime") == 0)
1	- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
2	- Try to fix parallel building
3	- Make the libopt tool less 'helpful'
4
5	--- lib/Makefile
6	+++ lib/Makefile
7	@@ -249,7 +249,7 @@
8	.PHONY: install.staticlib
9	install.staticlib: $(PKGDIR)/link
10	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
11	- $(PKGDIR)/link
12	+ $(PKGDIR)/lib
13
14	# Install a shared library stub -- the ".so" file used at link time to
15	# prepare a program for dynamically linking a library at run time
16	@@ -257,9 +257,9 @@
17	install.sharedlibstub: $(PKGDIR)/link
18	ifeq ($(NETPBMLIBTYPE),unixshared)
19	# install the link-time (.so) links to the runtime libraries
20	- cd $(PKGDIR)/link ; \
21	+ cd $(PKGDIR)/lib ; \
22	rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
23	- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
24	+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
25	libnetpbm.$(NETPBMLIBSUFFIX)
26	endif
27	ifeq ($(NETPBMLIBTYPE),dll)
28	--- GNUmakefile
29	+++ GNUmakefile
30	@@ -87,6 +87,9 @@
31
32	.PHONY: nonmerge
33	nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
34	+
35	+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
36	+converter/all analyzer/all editor/all generator/all other/all: lib/all
37
38	OMIT_CONFIG_RULE = 1
39	include $(SRCDIR)/Makefile.common
40	--- buildtools/libopt.c
41	+++ buildtools/libopt.c
42	@@ -502,7 +502,7 @@
43
44	strcpy(outputLine, ""); /* initial value */
45	runtime = FALSE; /* initial value */
46	- quiet = FALSE; /* initial value */
47	+ quiet = TRUE; /* initial value */
48	error = FALSE; /* no error yet */
49	for (arg = 1; arg < argc && !error; arg++) {
50	if (strcmp(argv[arg], "-runtime") == 0)