summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2003-12-30 16:10:27 +0000
committeragc <agc>2003-12-30 16:10:27 +0000
commitbbf70f75497e54066319a7b91e679e2807f3dea7 (patch)
treeff494c262f3292db47c3fcb79ac0876775ff5308
parentdf9a438d3e9a8fdcced51b50117e5c95968082a0 (diff)
downloadpkgsrc-bbf70f75497e54066319a7b91e679e2807f3dea7.tar.gz
Pullup correct functionality to pkgsrc-2003Q4 branch, requested by
Julio M. Merino Vidal. Module Name: pkgsrc Committed By: jmmv Date: Sat Dec 20 09:45:55 UTC 2003 Modified Files: pkgsrc/mk: bsd.pkg.install.mk pkgsrc/mk/install: header Log Message: Define LS in install scripts (needed by install/fonts).
-rw-r--r--mk/bsd.pkg.install.mk3
-rw-r--r--mk/install/header3
2 files changed, 4 insertions, 2 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 9d670a0fb62..51317d2f090 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.53 2003/11/23 07:14:43 jlam Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.53.2.1 2003/12/30 16:10:27 agc Exp $
#
# This Makefile fragment is included by package Makefiles to use the common
# INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply:
@@ -254,6 +254,7 @@ FILES_SUBST+= ID=${ID:Q}
FILES_SUBST+= INSTALL_INFO=${INSTALL_INFO:Q}
FILES_SUBST+= LINKFARM=${LINKFARM:Q}
FILES_SUBST+= LN=${LN:Q}
+FILES_SUBST+= LS=${LS:Q}
FILES_SUBST+= MKDIR=${MKDIR:Q}
FILES_SUBST+= MV=${MV:Q}
FILES_SUBST+= PERL5=${PERL5:Q}
diff --git a/mk/install/header b/mk/install/header
index 4f78b37545f..317f0951bc9 100644
--- a/mk/install/header
+++ b/mk/install/header
@@ -2,7 +2,7 @@
#
# start of header
#
-# $NetBSD: header,v 1.23 2003/09/17 02:38:30 jlam Exp $
+# $NetBSD: header,v 1.23.2.1 2003/12/30 16:10:27 agc Exp $
PKGNAME=$1
STAGE=$2
@@ -28,6 +28,7 @@ HEAD="@HEAD@"
ID="@ID@"
LINKFARM="@LINKFARM@"
LN="@LN@"
+LS="@LS@"
MKDIR="@MKDIR@"
MV="@MV@"
PERL5="@PERL5@"