--- Pbmplus.tmpl.orig	Sat Aug 19 13:57:43 1995
+++ Pbmplus.tmpl	Sun Oct 17 18:41:14 1999
@@ -13,11 +13,6 @@
  * purpose. It is provided "as is" without express or implied warranty.
  */
 
-/* Set where to install PbmPLus */
-         BINDIR = /usr/X11R6/pbmplus
-         MANDIR = /usr/X11R6/man
-      MANSUFFIX = 1p
-
 /* CONFIGURE: PBMPLUS's support for TIFF files depends on the library from
  * Sam Leffler's TIFF Software package - see the OTHER.SYSTEMS file for a
  * full description and access information.  To configure PBMPLUS to use the
@@ -48,10 +43,10 @@
 #define InstallManuals   YES
 #endif
 #ifndef InstallLibraries
-#define InstallLibraries NO
+#define InstallLibraries YES
 #endif
 #ifndef InstallIncludes
-#define InstallIncludes  NO
+#define InstallIncludes  YES
 #endif
 
 /* CONFIGURE: Normally the Imakefiles build and install separate binaries for
@@ -68,7 +63,7 @@
  * until you do the install.
  */
 #ifndef InstallMerged
-#define InstallMerged NO
+#define InstallMerged YES
 #endif
 
 
@@ -80,7 +75,7 @@
 #define PbmplusBinDir $(BINDIR)
 #endif
 #ifndef PbmplusManDir
-#define PbmplusManDir $(MANDIR)
+#define PbmplusManDir $(MANPATH)
 #endif
 #ifndef PbmplusLibDir
 #define PbmplusLibDir $(USRLIBDIR)
@@ -105,7 +100,10 @@
 #define PnmDir TOPDIR/pnm
 #endif
 #ifndef TiffDir
-#define TiffDir TOPDIR/libtiff
+#define TiffDir %%LOCALBASE%%/lib
+#endif
+#ifndef TiffIncDir
+#define TiffIncDir %%LOCALBASE%%/include
 #endif
 
 /* Libraries: */
@@ -122,7 +120,11 @@
 #define LibPnm $(PNMDIR)/libpnm.a
 #endif
 #ifndef LibTiff
-#define LibTiff $(TIFFDIR)/libtiff.a
+#if UseElfFormat
+#define LibTiff -L$(TIFFDIR) -ltiff -ljpeg -lz
+#else
+#define LibTiff -L$(TIFFDIR) -ltiff
+#endif
 #endif
 
 /* Dependency libraries: */
@@ -139,7 +141,7 @@
 #define DepLibPnm LibPnm
 #endif
 #ifndef DepLibTiff
-#define DepLibTiff LibTiff
+#define DepLibTiff $(TIFFDIR)/libtiff.a
 #endif
 
    PBMPLUSDIR = PbmplusDir
@@ -153,6 +155,7 @@
        PPMDIR = PpmDir
        PNMDIR = PnmDir
       TIFFDIR = TiffDir
+   TIFFINCDIR = TiffIncDir
 
        LIBPBM = LibPbm
        LIBPGM = LibPgm
@@ -171,8 +174,8 @@
 #define InstallPbmplusPrograms(list,dest,flags)                             @@\
 install:: list                                                              @@\
 	MakeDir($(DESTDIR)dest)                                             @@\
-	stamp-date                                                          @@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                        @@\
+	TOPDIR/stamp-date                                                   @@\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;                          @@\
 	for i in list; do \                                                 @@\
 		(set -x; cd $(DESTDIR)dest; $(RM) $$i;  \                   @@\
 		$(LN) $(MERGE) $$i); \                                      @@\
@@ -187,14 +190,14 @@
 #endif /* NormalPbmplusProgramTarget */
 
 #ifndef NormalPbmplusMathProgramTarget
-#define NormalPbmplusMathProgramTarget(program) \                           @@\
+#define NormalPbmplusMathProgramTarget(program)                             @@\
 NormalPbmplusProgramTarget(program)
 #endif /* NormalPbmplusMathProgramTarget */
 
 #else
 
 #ifndef NormalPbmplusProgramTarget
-#define NormalPbmplusProgramTarget(program) \                               @@\
+#define NormalPbmplusProgramTarget(program)                                 @@\
 NormalProgramTarget(program,program.o,$(CURRENTDEPLIBS),$(CURRENTLIBS),)
 #endif /* NormalPbmplusProgramTarget */
 
@@ -207,7 +210,7 @@
 #define InstallPbmplusPrograms(list,dest,flags)                             @@\
 install:: list                                                              @@\
 	MakeDir($(DESTDIR)dest)                                             @@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                        @@\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;                          @@\
 	for i in list; do \                                                 @@\
 		(set -x; $(RM) $(DESTDIR)dest/$$i; \                        @@\
 		$(INSTALL) -c flags $$i $(DESTDIR)dest); \                  @@\
@@ -215,3 +218,18 @@
 #endif /* InstallPbmplusPrograms */
 
 #endif /* InstallMerged */
+
+#ifndef InstallMultipleManSuff
+#define InstallMultipleManSuff(list,dest,suff)                              @@\
+install.man:: list                                                          @@\
+	MakeDir($(DESTDIR)dest)                                             @@\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                        @@\
+	for i in list; do \                                                 @@\
+		(set -x; \                                                  @@\
+		MNAME=`echo $$i | cut -f1 -d.`; \                           @@\
+		$(RM) $(DESTDIR)dest/$${MNAME}*; \                          @@\
+		$(INSTALL) -c $(INSTMANFLAGS) $$i \                         @@\
+		  $(DESTDIR)dest/$${MNAME}.suff; \                          @@\
+		$(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.suff); \         @@\
+	done
+#endif
