Remove unneeded post installation code.

Fix patch so info/dir is not overwritten; noticed by mah@everybody.org.
This commit is contained in:
fgsch 1999-11-10 05:48:03 +00:00
parent ddefd7470c
commit edfa0ccf72
2 changed files with 10 additions and 30 deletions

View File

@ -1,13 +1,14 @@
# $OpenBSD: Makefile,v 1.14 1999/11/08 06:22:37 fgsch Exp $ # $OpenBSD: Makefile,v 1.15 1999/11/10 05:48:03 fgsch Exp $
DATE= 19991012
DISTNAME= mtools-3.9.6 DISTNAME= mtools-3.9.6
PKGNAME= mtools-3.9.6-1012 PKGNAME= mtools-3.9.6-${DATE}
CATEGORIES= sysutils CATEGORIES= sysutils
DIST_SUBDIR= mtools DIST_SUBDIR= mtools
MASTER_SITES= ftp://ftp.tux.org/pub/tux/knaff/mtools/ MASTER_SITES= ftp://ftp.tux.org/pub/tux/knaff/mtools/
PATCH_SITES= ftp://ftp.tux.org/pub/tux/knaff/mtools/ PATCH_SITES= ftp://ftp.tux.org/pub/tux/knaff/mtools/
PATCHFILES= mtools-3.9.6-19991012.diff.gz PATCHFILES= mtools-3.9.6-${DATE}.diff.gz
MAINTAINER= fgsch@openbsd.org MAINTAINER= fgsch@openbsd.org
@ -20,10 +21,4 @@ pre-patch:
post-patch: post-patch:
@${RM} ${WRKSRC}/mtools @${RM} ${WRKSRC}/mtools
post-install:
@if [ ! -f ${PREFIX}/info/dir ]; then \
${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
fi
@install-info ${PREFIX}/info/mtools.info ${PREFIX}/info/dir
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Thu Jul 1 13:21:58 1999 --- Makefile.in.orig Thu Jul 1 14:21:58 1999
+++ Makefile.in Fri Jul 9 00:08:05 1999 +++ Makefile.in Wed Nov 10 02:27:02 1999
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=@srcdir@ VPATH=@srcdir@
@ -9,7 +9,7 @@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
infodir = @infodir@ infodir = @infodir@
@@ -47,10 +47,10 @@ @@ -47,10 +47,11 @@
MACHDEPLIBS = @MACHDEPLIBS@ MACHDEPLIBS = @MACHDEPLIBS@
LN_S = @LN_S@ LN_S = @LN_S@
@ -21,26 +21,11 @@
+INSTALL_DATA = ${BSD_INSTALL_DATA} +INSTALL_DATA = ${BSD_INSTALL_DATA}
+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} +INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
+INSTALL_MAN = ${BSD_INSTALL_MAN} +INSTALL_MAN = ${BSD_INSTALL_MAN}
+INSTALL_INFO = @INSTALL_INFO@
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .o .c .SUFFIXES: .o .c
@@ -195,12 +195,12 @@ @@ -248,7 +249,7 @@
$(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
done; \
fi; \
- if [ -n "$(INSTALL_INFO)" ] ; then \
+ if [ -n "$(INSTALL_DATA)" ] ; then \
if [ -f $(infodir)/dir.info ] ; then \
- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
+ $(INSTALL_DATA) $(infodir)/mtools.info $(infodir)/dir.info; \
fi; \
if [ -f $(infodir)/dir ] ; then \
- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
+ $(INSTALL_DATA) $(infodir)/mtools.info $(infodir)/dir; \
fi; \
fi
@@ -248,7 +248,7 @@
install-scripts: $(bindir)/mtools install-scripts: $(bindir)/mtools
@$(top_srcdir)/mkinstalldirs $(bindir) @$(top_srcdir)/mkinstalldirs $(bindir)
@for j in $(SCRIPTS) ; do \ @for j in $(SCRIPTS) ; do \
@ -49,7 +34,7 @@
echo $(bindir)/$$j ; \ echo $(bindir)/$$j ; \
done done
rm -f $(bindir)/lz rm -f $(bindir)/lz
@@ -257,12 +257,12 @@ @@ -257,12 +258,12 @@
install-man: install-man:
@$(top_srcdir)/mkinstalldirs $(MAN1DIR) @$(top_srcdir)/mkinstalldirs $(MAN1DIR)
@for j in $(MAN1); do \ @for j in $(MAN1); do \