summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>1995-05-13 23:37:16 +0000
committerSatoshi Asami <asami@FreeBSD.org>1995-05-13 23:37:16 +0000
commit203fba2d95a3b3f1cd198805a73bc6b83397ffac (patch)
tree51ea9335b055950aabf2dee49d6915070eafa060 /Mk
parentI fixed it so that it works right. Basically the same changes were (diff)
Don't conditionalize fake-pkg on NO_PACKAGE.
Notes
Notes: svn path=/head/; revision=1734
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index f42ea4f51e65..46a127696428 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3,7 +3,7 @@
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
#
-# $Id: bsd.port.mk,v 1.160 1995/05/12 08:44:12 asami Exp $
+# $Id: bsd.port.mk,v 1.161 1995/05/13 05:37:45 asami Exp $
#
# Please view me with 4 column tabs!
@@ -775,9 +775,7 @@ ${INSTALL_COOKIE}:
DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
sh ${SCRIPTDIR}/post-install; \
fi
-.if !defined(NO_PACKAGE)
@${MAKE} ${.MAKEFLAGS} fake-pkg
-.endif
@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
.endif
@@ -1110,7 +1108,6 @@ describe:
# accordance to the @pkgdep directive in the packing lists
.if !target(fake-pkg)
-.if !defined(NO_PACKAGE)
fake-pkg:
@if [ ! -f ${PKGDIR}/PLIST -o ! -f ${PKGDIR}/COMMENT -o ! -f ${PKGDIR}/DESCR ]; then echo "** Missing package files for ${PKGNAME} - installation not recorded."; exit 1; fi
@if [ ! -d ${PKG_DBDIR} ]; then rm -f ${PKG_DBDIR}; mkdir -p ${PKG_DBDIR}; fi
@@ -1132,7 +1129,6 @@ fake-pkg:
${ECHO_MSG} " this port again to upgrade it properly."; \
fi
.endif
-.endif
# Depend is generally meaningless for arbitrary ports, but if someone wants
# one they can override this. This is just to catch people who've gotten into