diff options
Diffstat (limited to 'usr.sbin/pkg_add/pkg_create')
| -rw-r--r-- | usr.sbin/pkg_add/pkg_create | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/usr.sbin/pkg_add/pkg_create b/usr.sbin/pkg_add/pkg_create index 06920785eb1..dbf0e7a803c 100644 --- a/usr.sbin/pkg_add/pkg_create +++ b/usr.sbin/pkg_add/pkg_create @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_create,v 1.22 2004/10/11 14:25:28 espie Exp $ +# $OpenBSD: pkg_create,v 1.23 2004/10/12 09:34:01 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -284,6 +284,26 @@ if (defined $opt_d) { print "Creating package $ARGV[0]\n" if $opt_v; +if (defined $opt_i) { + copy_subst($opt_i, $dir.INSTALL); +} + +if (defined $opt_k) { + copy_subst($opt_k, $dir.DEINSTALL); +} + +if (defined $opt_r) { + copy_subst($opt_r, $dir.REQUIRE); +} + +if (defined $opt_M) { + copy_subst($opt_M, $dir.DISPLAY); +} + +if (defined $opt_U) { + copy_subst($opt_U, $dir.UNDISPLAY); +} + my $plist = new OpenBSD::PackingList; my @extra_files = (); for my $special (info_names()) { @@ -381,26 +401,6 @@ if ($errors) { my @cmd = $plist->archive_cmd($dir, $base); -if (defined $opt_i) { - copy_subst($opt_i, $dir.INSTALL); -} - -if (defined $opt_k) { - copy_subst($opt_k, $dir.DEINSTALL); -} - -if (defined $opt_r) { - copy_subst($opt_r, $dir.REQUIRE); -} - -if (defined $opt_M) { - copy_subst($opt_M, $dir.DISPLAY); -} - -if (defined $opt_U) { - copy_subst($opt_U, $dir.UNDISPLAY); -} - if (!defined $plist->{name}) { print STDERR "Can't write unnamed packing list\n"; |