Merge branch 'feature/build-system-improvements'.

2 files changed, 20 insertions, 68 deletions

diff --git a/lib/package/Makefile.in b/lib/package/Makefile.in
deleted file mode 100644
index c28c412..0000000
--- a/lib/package/Makefile.in
+++ /dev/null
@@ -1,68 +0,0 @@
-# opkbuild
-# Makefile.in
-# Input Makefile for configure.
-#
-# Copyright (C) 2012 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/>.
-
-package_name = @package_name@
-package_version= @package_version@
-
-srcdir = @srcdir@
-prefix = @prefix@
-libdir = @libdir@
-
-sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\
-             s&@@PACKAGE_VERSION@@&$(package_version)&;
-
-.SUFFIXES:
-.SUFFIXES: .sh .sm
-
-SRCS = 2.sh
-OBJS = $(SRCS:.sh=.sm)
-
-distdir = ../../$(package_name)-$(package_version)/lib/package
-distfiles = Makefile.in $(SRCS)
-
-all: $(OBJS)
-
-$(OBJS):
-	@printf '  SED lib/package/%s\n' '$@'
-	@sed '$(sed_script)' '$(srcdir)/lib/package/$*.sh' >'$@'
-
-clean:
-	@for obj in $(OBJS); do \
-		printf '  RM lib/package/%s\n' "$${obj}"; \
-		rm -f "$${obj}"; \
-	done
-
-install: all
-	@mkdir -p '$(DESTDIR)/$(libopkbuild)/package'
-	@for obj in $(OBJS); do \
-		printf '  INSTALL lib/package/%s\n' "$${obj}"; \
-		cp "$${obj}" "$(DESTDIR)/$(libopkbuild)/package/$${obj}"; \
-		chmod 644 "$(DESTDIR)/$(libopkbuild)/package/$${obj}"; \
-	done
-
-uninstall:
-	@for obj in $(OBJS); do \
-		printf '  RM %s\n' "$${obj}"; \
-		rm -f "$(DESTDIR)/$(libopkbuild)/package/$${obj}"; \
-	done
-	@rmdir '$(DESTDIR)/$(libopkbuild)/package' 2>/dev/null || true
-
-$(distdir):
-	@mkdir -p '$(distdir)'
-	@cp -pR $(distfiles) '$(distdir)'
diff --git a/lib/package/local.mk b/lib/package/local.mk
new file mode 100644
index 0000000..6839f77
--- /dev/null
+++ b/lib/package/local.mk
@@ -0,0 +1,20 @@
+# opkbuild
+# lib/package/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/>.
+
+pkglibpackage_srcs = \
+	lib/package/2.sh