From 20c66a1eaef872dbfad4ba82d2ca1c74eb4c9818 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sat, 01 Mar 2014 19:40:11 -0500
Subject: Merge branch 'feature/autoconf-and-automake'.

---
(limited to 'lib/buildsystem')

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
--
cgit v0.9.1