From 3b116c78128bef9d413b299d2a44d1bc10c10361 Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Sun, 12 Nov 2006 04:51:56 +0000 Subject: [PATCH] Add a libmagic.3 manual page. Thank you to swildner for the implementation of pulling VERSION from config.h. --- contrib/file-4/README.DELETED | 6 ++++-- lib/libmagic/Makefile | 33 +++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/contrib/file-4/README.DELETED b/contrib/file-4/README.DELETED index 397f567301..6b360bc2d9 100644 --- a/contrib/file-4/README.DELETED +++ b/contrib/file-4/README.DELETED @@ -1,4 +1,3 @@ -.cvsignore Makefile.am Makefile.in PORTING @@ -16,7 +15,10 @@ ltconfig ltmain.sh missing mkinstalldirs -doc +doc/Makefile.am +doc/Makefile.in +doc/file.man +doc/magic.man magic/Makefile.am magic/Makefile.in python diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 7e1f5fd342..13cb67b459 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -1,10 +1,10 @@ -# $DragonFly: src/lib/libmagic/Makefile,v 1.12 2006/11/11 21:41:18 pavalos Exp $ - -MAGICDIR= ${.CURDIR}/../../contrib/file-4/magic -CONTRIBDIR= ${.CURDIR}/../../contrib/file-4/src -.PATH: ${CONTRIBDIR} +# $DragonFly: src/lib/libmagic/Makefile,v 1.13 2006/11/12 04:51:56 pavalos Exp $ +CONTRIBDIR= ${.CURDIR}/../../contrib/file-4 +MAGICDIR= ${CONTRIBDIR}/magic +.PATH: ${CONTRIBDIR}/src +VERSION!= grep -w VERSION config.h | awk -F\" '{print $$2}' MAGIC= /usr/share/misc/magic LIB= magic @@ -15,11 +15,22 @@ SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c\ INCS= magic.h CFLAGS+= -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\" -CFLAGS+= -I${.CURDIR} -I${CONTRIBDIR} +CFLAGS+= -I${.CURDIR} -I${CONTRIBDIR}/src +MAN= libmagic.3 +MLINKS+= libmagic.3 magic_open.3 +MLINKS+= libmagic.3 magic_close.3 +MLINKS+= libmagic.3 magic_error.3 +MLINKS+= libmagic.3 magic_errno.3 +MLINKS+= libmagic.3 magic_file.3 +MLINKS+= libmagic.3 magic_buffer.3 +MLINKS+= libmagic.3 magic_setflags.3 +MLINKS+= libmagic.3 magic_check.3 +MLINKS+= libmagic.3 magic_compile.3 +MLINKS+= libmagic.3 magic_load.3 -CLEANFILES+= magic magic.mgc magic.mime.mgc magic.mime.lnk +CLEANFILES+= magic magic.mgc magic.mime.mgc magic.mime.lnk libmagic.3 FILES= magic magic.mgc ${MAGICDIR}/magic.mime magic.mime.mgc FILESDIR= /usr/share/misc @@ -27,6 +38,12 @@ FILESDIR= /usr/share/misc MAGFILES= ${MAGICDIR}/Header ${MAGICDIR}/Localstuff\ ${MAGICDIR}/Magdir/[a-z]* +libmagic.3: ${CONTRIBDIR}/doc/libmagic.man + sed -e s@__CSECTION__@1@g \ + -e s@__FSECTION__@5@g \ + -e s@__VERSION__@${VERSION}@g \ + -e s@__MAGIC__@${MAGIC}@g ${.ALLSRC} > ${.TARGET} + all: ${LIB} magic.mgc magic.mime.mgc magic: ${MAGFILES} @@ -41,7 +58,7 @@ magic.mime.mgc: mkmagic.nx ${MAGICDIR}/magic.mime CLEANFILES+= mkmagic.nx build-tools: mkmagic.nx -NXCFLAGS+= -DHAVE_CONFIG_H -DCOMPILE_ONLY -I${.CURDIR} -I${CONTRIBDIR} +NXCFLAGS+= -DHAVE_CONFIG_H -DCOMPILE_ONLY -I${.CURDIR} -I${CONTRIBDIR}/src mkmagic.nx: apprentice.c funcs.c magic.c print.c ${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET} -- 2.41.0