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

11 files changed, 38 insertions, 92 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
deleted file mode 100644
index 21c1451..0000000
--- a/src/Makefile.in
+++ /dev/null
@@ -1,83 +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@
-bindir = @bindir@
-libdir = @libdir@
-libopkbuild = @libopkbuild@
-
-sh = @sh@
-
-sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\
-             s&@@PACKAGE_VERSION@@&$(package_version)&;\
-             s&@@BINDIR@@&$(bindir)&;\
-             s&@@LIBOPKBUILD@@&$(libopkbuild)&;\
-             s&@@SH@@&$(sh)&;
-
-.SUFFIXES:
-.SUFFIXES: .sh
-
-SRCS = opkbuild.sh \
-       ob-checkbuilddeps.sh \
-       ob-buildenv.sh \
-       ob-unpacksource.sh \
-       ob-applypatches.sh \
-       ob-installplatconf.sh \
-       ob-installdocs.sh \
-       ob-gencontrol.sh \
-       ob-buildopk.sh \
-#      ob-genchanges.sh
-OBJS = $(SRCS:.sh=)
-
-distdir = ../$(package_name)-$(package_version)/src
-distfiles = Makefile.in $(SRCS)
-
-all: $(OBJS)
-
-$(OBJS):
-	@printf '  SED src/%s\n' '$@'
-	@sed '$(sed_script)' '$(srcdir)/src/$@.sh' >'$@'
-
-clean:
-	@for obj in $(OBJS); do \
-		printf '  RM src/%s\n' "$${obj}"; \
-		rm -f "$${obj}"; \
-	done
-
-install: all
-	@for obj in $(OBJS); do \
-		printf '  INSTALL src/%s\n' "$${obj}"; \
-		mkdir -p '$(DESTDIR)/$(bindir)'; \
-		cp "$${obj}" "$(DESTDIR)/$(bindir)/$${obj}"; \
-		chmod 755 "$(DESTDIR)/$(bindir)/$${obj}"; \
-	done
-
-uninstall:
-	@for obj in $(OBJS); do \
-		printf '  RM %s\n' "$${obj}"; \
-		rm -f "$(DESTDIR)/$(bindir)/$${obj}"; \
-	done
-
-$(distdir):
-	@mkdir -p '$(distdir)'
-	@cp -pR $(distfiles) '$(distdir)'
diff --git a/src/local.mk b/src/local.mk
new file mode 100644
index 0000000..06eeb4b
--- /dev/null
+++ b/src/local.mk
@@ -0,0 +1,29 @@
+# opkbuild
+# src/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/>.
+
+bin_srcs = \
+	src/opkbuild.sh \
+	src/ob-checkbuilddeps.sh \
+	src/ob-buildenv.sh \
+	src/ob-unpacksource.sh \
+	src/ob-applypatches.sh \
+	src/ob-installplatconf.sh \
+	src/ob-installdocs.sh \
+	src/ob-gencontrol.sh \
+	src/ob-buildopk.sh \
+#	src/ob-genchanges.sh
diff --git a/src/ob-applypatches.sh b/src/ob-applypatches.sh
index 66f41da..a522238 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 <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh
index 1cfa66c..e02c19a 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 <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh
index 4f947f8..264e532 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 <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
index 1c39067..be7b875 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 <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
index 16eec5d..542117d 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 <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh
index d415909..5cd49a9 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 <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-installplatconf.sh b/src/ob-installplatconf.sh
index 9458f91..5a29442 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 <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh
index 78ed4e0..07c8d48 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 <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index c6f6fc7..a3ad831 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 <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output