diff options
| author | P. J. McDermott <pjm@nac.net> | 2014-03-01 19:40:11 (EST) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2014-03-01 19:40:11 (EST) |
| commit | 20c66a1eaef872dbfad4ba82d2ca1c74eb4c9818 (patch) | |
| tree | bf0f90695808884889e69b83ae898da21a55eccb /lib/buildsystem | |
| parent | b732112c8e1b99ade1c89fa51ec1683fae05b21c (diff) | |
| parent | 20223fd13a6fadc7ea5a6519bb72a1e395b43223 (diff) | |
Merge branch 'feature/autoconf-and-automake'.
Diffstat (limited to 'lib/buildsystem')
| -rw-r--r-- | lib/buildsystem/autoconf.sh | 2 | ||||
| -rw-r--r-- | lib/buildsystem/local.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/buildsystem/autoconf.sh b/lib/buildsystem/autoconf.sh index 7ec8938..716ebca 100644 --- a/lib/buildsystem/autoconf.sh +++ b/lib/buildsystem/autoconf.sh @@ -48,7 +48,7 @@ _oh_autoconf_configure() "${_OH_BUILDSYSTEM_TARGET_ARCH}" 'autoconf')" fi - if [ '@@MULTIARCH_LIBDIR@@' = 'true' ]; then + if [ '@multiarch_libdir@' = 'yes' ]; then libdir='${prefix}/lib/'"${OPK_HOST_ARCH}" else libdir='${prefix}/lib/' diff --git a/lib/buildsystem/local.mk b/lib/buildsystem/local.mk index 76cf972..bacf27d 100644 --- a/lib/buildsystem/local.mk +++ b/lib/buildsystem/local.mk @@ -16,7 +16,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/>. -pkglibbuildsystem_srcs = \ +pkgdatabuildsystem_sources = \ lib/buildsystem/autoconf.sh \ lib/buildsystem/kbuild.sh \ lib/buildsystem/make.sh |