diff options
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rw-r--r-- | locale/en_US/opkbuild.sh | 2 | ||||
| -rw-r--r-- | optstring | 1 | ||||
| -rw-r--r-- | src/opkbuild.sh | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 7df5da9..e8201b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,8 @@ metadata = @metadata@ pkglibpackagedir = $(pkglibdir)/package pkglibmetadatadir = $(pkglibdir)/metadata -helperdir = $(datadir)/$(package_name)/helpers +pkgdatadir = $(datadir)/$(package_name) +helperdir = $(pkgdatadir)/helpers include $(srcdir)/src/local.mk include $(srcdir)/lib/local.mk @@ -60,6 +61,7 @@ pkglibmetadata = $(pkglibmetadata_srcs:.sh=.sm) man1 = $(man1_srcs:.1in=.1) man3 = $(man3_srcs:.3in=.3) locale = $(locale_srcs:.sh=.ms) +pkgdata = optstring distdir = $(package_name)-$(package_version) # TODO: Remove mksysconf.in when no longer used. @@ -75,6 +77,7 @@ distfiles = \ NEWS \ NEWS.opkhelper \ TODO \ + optstring \ scripts/changelog2news.sh \ src/local.mk \ lib/local.mk \ @@ -188,7 +191,7 @@ install-pkglibpackage: install-pkglibmetadata: @files='$(pkglibmetadata)'; dir='$(pkglibmetadatadir)'; \ mode='644'; $(install_cmds) -install-data: all-data install-man1 install-man3 install-locale +install-data: all-data install-man1 install-man3 install-locale install-pkgdata install-man1: @files='$(man1)'; dir='$(man1dir)'; mode='644'; $(install_cmds) install-man3: @@ -204,6 +207,8 @@ install-locale: cp "$${f}" "$${df}"; \ chmod 644 "$${df}"; \ done +install-pkgdata: + @files='$(pkgdata)'; dir='$(pkgdatadir)'; mode='644'; $(install_cmds) uninstall_cmds = \ set -e; \ diff --git a/locale/en_US/opkbuild.sh b/locale/en_US/opkbuild.sh index f6a50d5..2f34f96 100644 --- a/locale/en_US/opkbuild.sh +++ b/locale/en_US/opkbuild.sh @@ -30,7 +30,7 @@ Options: -a <host-arch> distribution architecture for which architecture- dependent packages should be built (default: system architecture) - -P <host-plat> application platform for which platform-specific + -p <host-plat> application platform for which platform-specific packages should be configured (default: system platform) -D check build dependencies (default behavior) diff --git a/optstring b/optstring new file mode 100644 index 0000000..2266fa0 --- /dev/null +++ b/optstring @@ -0,0 +1 @@ +bBASFT:a:p:DdCcr:hV diff --git a/src/opkbuild.sh b/src/opkbuild.sh index 6ae8df5..d5df3c5 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -106,7 +106,7 @@ version() get_options() { # Parse and handle command-line options. - while getopts 'bBASFT:a:P:DdCcr:hV' opt; do + while getopts 'bBASFT:a:p:DdCcr:hV' opt; do case "${opt}" in b) if [ -n "${opt_build}" ]; then @@ -144,7 +144,7 @@ get_options() a) opt_host_arch="${OPTARG}" ;; - P) + p) opt_host_plat="${OPTARG}" ;; D) |