diff options
| author | xtraeme <xtraeme> | 2005-02-18 00:26:07 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2005-02-18 00:26:07 +0000 |
| commit | 6171884e43dfdc9e3651cd108310a2a4a99bdc89 (patch) | |
| tree | 7f5cc4134d6bd82e38b38de313c195c2335b9977 /bootstrap | |
| parent | a468e40e22e6f0a396631fc88cb46ac10e940bf8 (diff) | |
| download | pkgsrc-6171884e43dfdc9e3651cd108310a2a4a99bdc89.tar.gz | |
Before copying the mk.conf.example file into PKG_SYSCONFDIR, the
directory must be created... do it.
Also replace /usr/pkg with $prefix in a few places.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/mkbinarykit | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/bootstrap/mkbinarykit b/bootstrap/mkbinarykit index 32852ace9c5..a6495974607 100755 --- a/bootstrap/mkbinarykit +++ b/bootstrap/mkbinarykit @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: mkbinarykit,v 1.11 2005/01/16 03:02:02 grant Exp $ +# $NetBSD: mkbinarykit,v 1.12 2005/02/18 00:26:07 xtraeme Exp $ # # Make a binary bootstrap kit and place it in targetdir (or current # working directory if not specified). The mk.conf.example file is @@ -19,8 +19,9 @@ ospro=`uname -p` date=`date +%Y%m%d` prefix=/usr/pkg +sysconfdir=/etc pkgdbdir=/var/db/pkg -mkfile=/etc/mk.conf +mkfile=$sysconfdir/mk.conf ignorecasecheck=no ignoreusercheck=no force=no @@ -32,32 +33,33 @@ sedprog="sed" case "$opsys" in AIX) - mkfile=/usr/pkg/etc/mk.conf - pkgdbdir=/usr/pkg/pkgdb + syscondir=$prefix/etc + mkfile=$sysconfdir/mk.conf + pkgdbdir=$prefix/pkgdb ;; DragonFly) # Don't use the ports /var/db/pkg - pkgdbdir=/usr/pkg/pkgdb + pkgdbdir=$prefix/pkgdb ;; FreeBSD) # Don't use the ports /var/db/pkg - pkgdbdir=/usr/pkg/pkgdb + pkgdbdir=$prefix/pkgdb ;; Interix) - mkfile=/etc/mk.conf.example + mkfile=$sysconfdir/mk.conf.example # Don't use the interopsystems.com package dir - pkgdbdir=/usr/pkg/pkgdb + pkgdbdir=$prefix/pkgdb ospro=i386 ;; NetBSD) # Don't overwrite the system's mk.conf - mkfile=/etc/mk.conf.example + mkfile=$sysconfdir/mk.conf.example ;; OpenBSD) # Don't overwrite the system's mk.conf - mkfile=/etc/mk.conf.example + mkfile=$sysconfdir/mk.conf.example # Don't use the ports /var/db/pkg - pkgdbdir=/usr/pkg/pkgdb + pkgdbdir=$prefix/pkgdb # Use "arch -s" instead of uname -p ospro=`arch -s` ;; @@ -133,6 +135,7 @@ $strip "$prefix/"sbin/* echo "Making binary kit." PATH="$prefix/bin:$PATH"; export PATH # in case tar was built by bootstrap +[ ! -d $sysconfdir ] && mkdir -p $sysconfdir cp ${wrkdir}/mk.conf.example $mkfile && \ cd / && \ tar -hcf "$targetdir/bootstrap-pkgsrc-$opsys-$osrev-$ospro-$date.tar" \ |