Segregate elf stuff and conditionally enable it with -DBUILTIN_ELF

More magic fixes

diff --git a/src/Makefile b/src/Makefile
index e5cabfbe53508c69993856ae04e27e230cc29ee7..f215f07f1244c069796ea9cb8109bb2c88a78928 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd. 
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile,v 1.52 1996/10/05 18:13:57 christos Exp $
+# @(#)$Id: Makefile,v 1.53 1996/10/05 18:15:29 christos Exp $
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
@@ -21,7 +21,7 @@
 #    ever read sources, credits must appear in the documentation.
 #
 # 4. This notice may not be removed or altered.
-VERSION        = 3.20
+VERSION        = 3.21
 SHELL  = /bin/sh
 #MAGIC = /etc/magic
 MAGIC  = /usr/local/etc/magic

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 96295b5e064426038e95b7bae5885768c674cb33..10708c5cb1bd92179bb2df9a88c508f131272206 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -1,12 +1,16 @@
 #define        FILE_VERSION_MAJOR      3
-#define        patchlevel              20
+#define        patchlevel              21
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.20 1996/06/22 22:15:52 christos Exp $
+ * $Id: patchlevel.h,v 1.21 1996/10/05 18:15:29 christos Exp $
  *
  * $Log: patchlevel.h,v $
- * Revision 1.20  1996/06/22 22:15:52  christos
+ * Revision 1.21  1996/10/05 18:15:29  christos
+ * Segregate elf stuff and conditionally enable it with -DBUILTIN_ELF
+ * More magic fixes
+ *
+ * Revision 1.20  1996/06/22  22:15:52  christos
  * - support relative offsets of the form >&
  * - fix bug with truncating magic strings that contain \n
  * - file -f - did not read from stdin as documented