Make lib/metadata/ non-recursive.

2 files changed, 31 insertions, 5 deletions

diff --git a/Makefile.in b/Makefile.in
index 09ae4a5..aac152d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,14 +49,17 @@ MACROS = \
 	'opkhelper_3_0=$(opkhelper_3_0)'
 
 pkglibpackagedir = $(pkglibdir)/package
+pkglibmetadatadir = $(pkglibdir)/metadata
 
 include $(srcdir)/src/local.mk
 include $(srcdir)/lib/local.mk
 include $(srcdir)/lib/package/local.mk
+include $(srcdir)/lib/metadata/local.mk
 
 bin = $(bin_srcs:.sh=)
 pkglib = $(pkglib_srcs:.sh=.sm)
 pkglibpackage = $(pkglibpackage_srcs:.sh=.sm)
+pkglibmetadata = $(pkglibmetadata_srcs:.sh=.sm)
 
 distdir = $(package_name)-$(package_version)
 distfiles = \
@@ -71,9 +74,11 @@ distfiles = \
 	src/local.mk \
 	lib/local.mk \
 	lib/package/local.mk \
+	lib/metadata/local.mk \
 	$(bin_srcs) \
 	$(pkglib_srcs) \
-	$(pkglibpackage_srcs)
+	$(pkglibpackage_srcs) \
+	$(pkglibmetadata_srcs)
 
 script = \
 	s&@@PACKAGE_NAME@@&$(package_name)&;\
@@ -81,9 +86,12 @@ script = \
 	s&@@BINDIR@@&$(bindir)&;\
 	s&@@PKGLIBDIR@@&$(pkglibdir)&;\
 	s&@@LIBOPKBUILD@@&$(libopkbuild)&;\
+	s&@@DATADIR@@&$(datadir)&;\
 	s&@@LOCALEDIR@@&$(localedir)&;\
+	s&@@SYSCONFDIR@@&$(sysconfdir)&;\
 	s&@@SH@@&$(sh)&;\
-	s&@@METADATA@@&$(metadata)&;
+	s&@@METADATA@@&$(metadata)&;\
+	s&@@OPKHELPER_3_0@@&$(opkhelper_3_0)&;
 
 .SUFFIXES:
 .SUFFIXES: .sh .sm
@@ -102,9 +110,7 @@ all-exec: all-bin all-pkglib all-pkglibpackage all-pkglibmetadata
 all-bin: $(bin)
 all-pkglib: $(pkglib)
 all-pkglibpackage: $(pkglibpackage)
-all-pkglibmetadata:
-	@printf 'Making library files...\n'
-	@cd lib/metadata && $(MAKE) $(MACROS) all
+all-pkglibmetadata: $(pkglibmetadata)
 all-data: all-man all-locale
 all-man:
 	@printf 'Making manual pages...\n'
diff --git a/lib/metadata/local.mk b/lib/metadata/local.mk
new file mode 100644
index 0000000..9c32560
--- /dev/null
+++ b/lib/metadata/local.mk
@@ -0,0 +1,20 @@
+# opkbuild
+# lib/metadata/local.mk
+#
+# Copyright (C) 2012-2013 Patrick "P. J." McDermott
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+pkglibmetadata_srcs = \
+	lib/metadata/proteanos.sh