diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-10-22 01:32:16 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-10-22 01:32:16 (EDT) |
| commit | 64cf6bb223423578b4aba393727debf0bb7295bd (patch) | |
| tree | c01233c27c71a9cec762934bb18e6dc791cfbb9c /src | |
| parent | 1a2a04be263600a2c90a498ea9e443e48d894dd1 (diff) | |
Move common load/init logic into libopkhelper.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/oh-autoconfigure.sh | 6 | ||||
| -rw-r--r-- | src/oh-fixperms.sh | 8 | ||||
| -rw-r--r-- | src/oh-installfiles.sh | 7 | ||||
| -rw-r--r-- | src/oh-strip.sh | 8 |
5 files changed, 7 insertions, 24 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 93abe0a..20a4c56 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -27,7 +27,6 @@ libdir = @libdir@ datadir = @datadir@ localedir = @localedir@ libopkhelper = @libopkhelper@ -libopkbuild_1 = @libopkbuild_1@ sh = @sh@ @@ -35,7 +34,6 @@ sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\ s&@@PACKAGE_VERSION@@&$(package_version)&;\ s&@@LOCALEDIR@@&$(localedir)&;\ s&@@LIBOPKHELPER@@&$(libopkhelper)&;\ - s&@@LIBOPKBUILD_1@@&$(libopkbuild_1)&;\ s&@@SH@@&$(sh)&; .SUFFIXES: diff --git a/src/oh-autoconfigure.sh b/src/oh-autoconfigure.sh index 5ae5263..cef8e7f 100644 --- a/src/oh-autoconfigure.sh +++ b/src/oh-autoconfigure.sh @@ -19,17 +19,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. '@@LIBOPKBUILD_1@@/load.sm' . '@@LIBOPKHELPER@@/load.sm' -ob_use locale -ob_use output oh_use buildsystem main() { - ob_set_locale_path '@@LOCALEDIR@@/%s/LC_MESSAGES/%s.ms' - ob_set_text_domain 'opkhelper' + oh_init while getopts 'S:B:' opt; do case "${opt}" in diff --git a/src/oh-fixperms.sh b/src/oh-fixperms.sh index b9029df..d8f3886 100644 --- a/src/oh-fixperms.sh +++ b/src/oh-fixperms.sh @@ -19,17 +19,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. '@@LIBOPKBUILD_1@@/load.sm' - -ob_use locale -ob_use output +. '@@LIBOPKHELPER@@/load.sm' main() { dir='dest' - ob_set_locale_path '@@LOCALEDIR@@/%s/LC_MESSAGES/%s.ms' - ob_set_text_domain 'opkhelper' + oh_init while getopts 'd:' opt; do case "${opt}" in diff --git a/src/oh-installfiles.sh b/src/oh-installfiles.sh index d77c89b..6288e6a 100644 --- a/src/oh-installfiles.sh +++ b/src/oh-installfiles.sh @@ -19,10 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. '@@LIBOPKBUILD_1@@/load.sm' +. '@@LIBOPKHELPER@@/load.sm' -ob_use locale -ob_use output ob_use package files_ifs=' @@ -32,8 +30,7 @@ main() { dir='dest' - ob_set_locale_path '@@LOCALEDIR@@/%s/LC_MESSAGES/%s.ms' - ob_set_text_domain 'opkhelper' + oh_init while getopts 'd:' opt; do case "${opt}" in diff --git a/src/oh-strip.sh b/src/oh-strip.sh index bf328a5..96c4d3f 100644 --- a/src/oh-strip.sh +++ b/src/oh-strip.sh @@ -19,10 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. '@@LIBOPKBUILD_1@@/load.sm' - -ob_use locale -ob_use output +. '@@LIBOPKHELPER@@/load.sm' CR=' ' @@ -32,8 +29,7 @@ main() dir='dest' keep_debug='false' - ob_set_locale_path '@@LOCALEDIR@@/%s/LC_MESSAGES/%s.ms' - ob_set_text_domain 'opkhelper' + oh_init while getopts 'd:k' opt; do case "${opt}" in |