From 6f58506752e09351d006699bd07d650e09fd4b60 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 22 Dec 2018 00:40:08 -0500 Subject: libopkbuild: Change output file extension to .sho --- diff --git a/.gitignore b/.gitignore index 02408f1..d44e520 100644 --- a/.gitignore +++ b/.gitignore @@ -21,8 +21,8 @@ mksysconf # Files generated by Makefile src/*[^.]?? -lib/*.sm -lib/*/*.sm +lib/*.sho +lib/*/*.sho man/*[^.]?? locale/*/*.ms opkbuild-*/ diff --git a/Makefile.am b/Makefile.am index b51ff20..26fb60e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,9 +35,9 @@ SHPPFLAGS = \ -DMETADATA="$(METADATA)" bin_SCRIPTS = $(bin_sources:.sh=) -pkgdata_SCRIPTS = $(pkgdata_sources:.sh=.sm) -pkgdatapackage_SCRIPTS = $(pkgdatapackage_sources:.sh=.sm) -pkgdatametadata_SCRIPTS = $(pkgdatametadata_sources:.sh=.sm) +pkgdata_SCRIPTS = $(pkgdata_sources:.sh=.sho) +pkgdatapackage_SCRIPTS = $(pkgdatapackage_sources:.sh=.sho) +pkgdatametadata_SCRIPTS = $(pkgdatametadata_sources:.sh=.sho) man1_MANS = $(man1_sources:.1in=.1) man3_MANS = $(man3_sources:.3in=.3) locale_MESSAGES = $(locale_sources:.sh=.ms) @@ -71,7 +71,7 @@ EXTRA_DIST = \ $(tests_data) \ tests/common.sh -SUFFIXES = .sh .sm .1in .1 .3in .3 .ms +SUFFIXES = .sh .sho .1in .1 .3in .3 .ms do_subst = sed \ -e 's|@[@]PACKAGE_NAME[@]@|$(PACKAGE_NAME)|g' \ @@ -166,7 +166,7 @@ test: $(AM_V_at)$(do_subst) $< >$@ $(AM_V_at)chmod a+x $@ -.sh.sm: +.sh.sho: $(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)" $(AM_V_at)$(SH) -n $< $(AM_V_at)'$(srcdir)/tools/shpp.sh' $(SHPPFLAGS) $< $@ diff --git a/lib/load.sh b/lib/load.sh index 9f52766..e0fe366 100644 --- a/lib/load.sh +++ b/lib/load.sh @@ -22,7 +22,7 @@ _OB_LOAD_SM=1 # The "common" module is used by this and all other modules. # We have to manually load the "common" module so we can use it in ob_use. -. "${PKGLIBDIR}/common.sm" +. "${PKGLIBDIR}/common.sho" ob_use() { @@ -34,7 +34,7 @@ ob_use() return 125 fi - module="${PKGLIBDIR}/${module}.sm" + module="${PKGLIBDIR}/${module}.sho" if [ -r "${module}" ]; then . "${module}" else diff --git a/src/ob-applypatches.sh b/src/ob-applypatches.sh index f3f0779..1504604 100644 --- a/src/ob-applypatches.sh +++ b/src/ob-applypatches.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh index ffe723a..669a960 100644 --- a/src/ob-buildenv.sh +++ b/src/ob-buildenv.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh index 5190786..2db00ee 100644 --- a/src/ob-buildopk.sh +++ b/src/ob-buildopk.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh index 678c41b..15a4585 100644 --- a/src/ob-checkbuilddeps.sh +++ b/src/ob-checkbuilddeps.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/src/ob-genchanges.sh b/src/ob-genchanges.sh index 2097204..988f958 100644 --- a/src/ob-genchanges.sh +++ b/src/ob-genchanges.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh index b0180e2..71a53db 100644 --- a/src/ob-gencontrol.sh +++ b/src/ob-gencontrol.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh index 25eafde..2cf27af 100644 --- a/src/ob-installdocs.sh +++ b/src/ob-installdocs.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/src/ob-installplatconf.sh b/src/ob-installplatconf.sh index 04405b2..b1c01f6 100644 --- a/src/ob-installplatconf.sh +++ b/src/ob-installplatconf.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh index 0324a4e..7aedc2b 100644 --- a/src/ob-unpacksource.sh +++ b/src/ob-unpacksource.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/src/opkbuild.sh b/src/opkbuild.sh index dfee628..52b2488 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. '@@PKGLIBDIR@@/load.sm' +. '@@PKGLIBDIR@@/load.sho' ob_use locale ob_use output diff --git a/tests/common.sh b/tests/common.sh index 2075558..b45d316 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -21,7 +21,7 @@ BUILDDIR="${PWD}/.." # The "common" module is used by all library modules. # We have to manually load the "common" module so we can use it in ob_use. -. "${BUILDDIR}/lib/common.sm" +. "${BUILDDIR}/lib/common.sho" ob_use() { @@ -33,7 +33,7 @@ ob_use() return 125 fi - module="${BUILDDIR}/lib/${module}.sm" + module="${BUILDDIR}/lib/${module}.sho" if [ -r "${module}" ]; then . "${module}" else -- cgit v0.9.1