- changed the location where the macro source files are expected to be

found to reflect the directories now recommended in the FAQ.
- added a resource fork with an rVersion.
- use catrez instead of copyfork
- make 'install' and 'release' targets consistent with the rest of
  the GNO builds.

lib/lsaneglue/Makefile

@@ -8,13 +8,18 @@
 
 .INCLUDE .IGNORE: ../../paths.mk
 
-LIBDIR = 13
+LIBDIR = /lib
 # Change INCDIR to 13/orcacdefs if you are using the "old-style"
-# path naming convention
+# path naming convention.
-# Or set to /lang/orca/include if you wish to completely replace
+# Or set to /lang/orca/libraries/orcacdefs if you wish to completely
-# ORCA/C's sane.h.
+# replace ORCA/C's sane.h.
 INCDIR = /usr/include
 
+# This is the directory containing the Apple and ByteWorks macro include
+# file subdirectories.  It is critical that ':' be used as the path
+# delimiter.
+IDIR	= :lang:orca:libraries
+
 # You should not have to modify anything beyond this point
 
 LIB	= lsaneglue
@@ -30,35 +35,34 @@ findfpe: findfpe.o findfpcp.o
 	occ -o findfpe findfpe.o findfpcp.o
 
 saneglue.mac: saneglue.asm saneglue.macro
-	macgen saneglue.asm saneglue.mac saneglue.mac saneglue.macro \
+	macgen -P saneglue.asm saneglue.mac saneglue.macro \
-	13:ainclude:m16.sane 13:orcainclude:m16.orca
+	$(IDIR):ainclude:m16.sane $(IDIR):orcainclude:m16.orca
 
 findfpcp.mac: findfpcp.asm
-	macgen findfpcp.asm findfpcp.mac findfpcp.mac \
+	macgen -P findfpcp.asm findfpcp.mac \
-	13:orcainclude:m16.orca
+	$(IDIR):orcainclude:m16.orca
 
-$(LIB): saneglue.o findfpcp.o
+$(LIB): saneglue.o findfpcp.o $(LIB).r
 	$(RM) $(LIB)
-	makelib $(LIB) +saneglue.o +findfpcp.o
+	makelib -P $(LIB) +saneglue.o +findfpcp.o
-	copyfork $(LIB).r $(LIB)
+	catrez -d $@ $(LIB).r
 
 install:
-	cp -f sane.h $(INCDIR)
+	install -d $(INCDIR) $(LIBDIR)
-	cp -f $(LIB) $(LIBDIR)
+	install sane.h $(INCDIR)
+	install $(LIB) $(LIBDIR)
 
 MI_LIBDIR	= $(RELEASE_DIR)/lib
 MI_INCDIR	= $(RELEASE_DIR)/usr/include
 MI_MANDIR	= $(RELEASE_DIR)/usr/man/man3
 MI_INSTALL	= $(RELEASE_DIR)/install
 
-makeinstall: $(LIB) sane.h saneglue.3 mkso.data
+release: $(LIB) sane.h saneglue.3 mkso.data
-	$(INSTALL) -d $(MI_LIBDIR)
+	install -d $(MI_LIBDIR) $(MI_INCDIR) $(MI_MANDIR) $(MI_INSTALL)
-	$(INSTALL) -d $(MI_INCDIR)
+	install $(LIB) $(MI_LIBDIR)
-	$(INSTALL) -d $(MI_MANDIR)
+	install sane.h $(MI_INCDIR)
-	$(INSTALL) $(LIB) $(MI_LIBDIR)
+	install saneglue.3 $(MI_MANDIR)
-	$(INSTALL) sane.h $(MI_INCDIR)
+	install mkso.data $(MI_INSTALL)/mkso.lsaneglue
-	$(INSTALL) saneglue.3 $(MI_MANDIR)
-	$(INSTALL) mkso.data $(MI_INSTALL)/mkso.lsaneglue
 
 findfpcp.o:: findfpcp.mac
 saneglue.o:: saneglue.mac

lib/lsaneglue/README

@@ -14,7 +14,7 @@ Installation
 ============
 
 In GNO/ME, run "dmake install".
-This will copy a changed sane.h to /lang/orca/include and the library
+This will copy a changed sane.h to /usr/include and the library
 lsaneglue to 13.
 If, on your system, includes are kept in a different directory (say
 13/orcacdefs), either copy the files manually or edit the file

lib/lsaneglue/fpspecnum.asm

@@ -11,7 +11,7 @@
 *
 
 dummy	start
-	copy 13:ainclude:e16.sane ; Apple-supplied SANE EQUs
+	copy :lang:orca:libraries:ainclude:e16.sane ; Apple-supplied SANE EQUs
 	end
 
 ****************************************************************

lib/lsaneglue/lsaneglue.rez

@@ -0,0 +1,30 @@
+/*
+ * Resources for version and comment
+ * 
+ * $Id: lsaneglue.rez,v 1.1 1998/02/08 03:16:54 gdr-ftp Exp $
+ */
+
+#define LIB	"lsaneglue for GNO"
+#define SOENKE	"S" $"9A" "nke Behrens"
+
+#include "Types.rez"
+
+/*
+ * Version
+ */
+resource rVersion (1, purgeable3) {
+	{ 1, 0, 0,	/* Version */
+	  release,	/* development|alpha|beta|final|release */
+	  0 },		/* non-final release number */
+	verUS,	/* Country */
+	LIB,
+	SOENKE
+};
+
+/*
+ * Comment
+ */
+resource rComment (1, purgeable3) {
+	LIB "\n"
+        SOENKE
+};

lib/lsaneglue/saneglue.asm

@@ -69,7 +69,7 @@
 *
 
 dummy	start
-	copy 13:ainclude:e16.sane ; Apple-supplied SANE EQUs
+	copy :lang:orca:libraries:ainclude:e16.sane ; Apple-supplied SANE EQUs
 	end
 
 ****************************************************************