Make lib/buildsystem/ non-recursive.

4 files changed, 34 insertions, 82 deletions

diff --git a/Makefile.in b/Makefile.in
index 9e0d4bd..5d6073e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,7 +66,6 @@ distfiles = \
 	$(src_distfiles)
 
 all: all-exec
-	@cd lib/buildsystem && $(MAKE) $(MACROS) all
 	@printf 'Making locales...\n'
 	@cd locale && $(MAKE) $(MACROS) all
 	@printf 'Making manual pages...\n'
@@ -76,7 +75,6 @@ all-bin: $(bin)
 all-lib: $(lib)
 
 clean: clean-exec
-	@cd lib/buildsystem && $(MAKE) $(MACROS) clean
 	@printf 'Cleaning locales...\n'
 	@cd locale && $(MAKE) $(MACROS) clean
 	@printf 'Cleaning manual pages...\n'
@@ -94,8 +92,6 @@ clean-lib:
 	done
 
 install: all install-exec
-	@printf 'Installing library files...\n'
-	@cd lib/buildsystem && $(MAKE) $(MACROS) install
 	@printf 'Installing locales...\n'
 	@cd locale && $(MAKE) $(MACROS) install
 	@printf 'Installing manual pages...\n'
@@ -105,7 +101,9 @@ install-bin:
 	@mkdir -p '$(DESTDIR)/$(bindir)'
 	@for f in $(bin); do \
 		printf '  INSTALL %s\n' "$${f}"; \
-		ff="$$(basename "$${f}")"; \
+		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
+		[ "x$${ff%/?*}" != "x$${ff}" ] && \
+			mkdir -p "$(DESTDIR)/$(bindir)/$${ff%/?*}"; \
 		cp "$${f}" "$(DESTDIR)/$(bindir)/$${ff}"; \
 		chmod 755 "$(DESTDIR)/$(bindir)/$${ff}"; \
 	done
@@ -113,14 +111,14 @@ install-lib:
 	@mkdir -p '$(DESTDIR)/$(libdir)'
 	@for f in $(lib); do \
 		printf '  INSTALL %s\n' "$${f}"; \
-		ff="$$(basename "$${f}")"; \
+		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
+		[ "x$${ff%/?*}" != "x$${ff}" ] && \
+			mkdir -p "$(DESTDIR)/$(libdir)/$${ff%/?*}"; \
 		cp "$${f}" "$(DESTDIR)/$(libdir)/$${ff}"; \
 		chmod 644 "$(DESTDIR)/$(libdir)/$${ff}"; \
 	done
 
 uninstall: uninstall-exec
-	@printf 'Uninstalling library files...\n'
-	@cd lib/buildsystem && $(MAKE) $(MACROS) uninstall
 	@printf 'Uninstalling locales...\n'
 	@cd locale && $(MAKE) $(MACROS) uninstall
 	@printf 'Uninstalling manual pages...\n'
@@ -129,13 +127,13 @@ uninstall-exec: uninstall-bin uninstall-lib
 uninstall-bin:
 	@for f in $(bin); do \
 		printf '  RM %s\n' "$${f}"; \
-		ff="$$(basename "$${f}")"; \
+		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
 		rm -f "$(DESTDIR)/$(bindir)/$${ff}"; \
 	done
 uninstall-lib:
 	@for f in $(lib); do \
 		printf '  RM %s\n' "$${f}"; \
-		ff="$$(basename "$${f}")"; \
+		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
 		rm -f "$(DESTDIR)/$(libdir)/$${ff}"; \
 	done
 
diff --git a/lib/buildsystem/Makefile.in b/lib/buildsystem/Makefile.in
deleted file mode 100644
index a7b3c59..0000000
--- a/lib/buildsystem/Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
-# opkhelper
-# 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@
-libopkhelper = @libopkhelper@
-multiarch_libdir = @multiarch_libdir@
-
-sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\
-             s&@@PACKAGE_VERSION@@&$(package_version)&;\
-             s&@@MULTIARCH_LIBDIR@@&$(multiarch_libdir)&;
-
-.SUFFIXES:
-.SUFFIXES: .sh .sm
-
-SRCS = autoconf.sh make.sh kbuild.sh
-OBJS = $(SRCS:.sh=.sm)
-
-distdir = ../../$(package_name)-$(package_version)/lib/buildsystem
-distfiles = Makefile.in $(SRCS)
-
-all: $(OBJS)
-
-$(OBJS):
-	@printf '  SED lib/buildsystem/%s\n' '$@'
-	@sed '$(sed_script)' '$(srcdir)/lib/buildsystem/$*.sh' >'$@'
-
-clean:
-	@for obj in $(OBJS); do \
-		printf '  RM lib/buildsystem/%s\n' "$${obj}"; \
-		rm -f "$${obj}"; \
-	done
-
-install: all
-	@mkdir -p '$(DESTDIR)/$(libopkhelper)/buildsystem'
-	@for obj in $(OBJS); do \
-		printf '  INSTALL lib/buildsystem/%s\n' "$${obj}"; \
-		cp "$${obj}" "$(DESTDIR)/$(libopkhelper)/buildsystem/$${obj}"; \
-		chmod 644 "$(DESTDIR)/$(libopkhelper)/buildsystem/$${obj}"; \
-	done
-
-uninstall:
-	@for obj in $(OBJS); do \
-		printf '  RM %s\n' "$${obj}"; \
-		rm -f "$(DESTDIR)/$(libopkhelper)/buildsystem/$${obj}"; \
-	done
-	@rmdir '$(DESTDIR)/$(libopkhelper)/buildsystem' 2>/dev/null || true
-
-$(distdir):
-	@mkdir -p '$(distdir)'
-	@cp -pR $(distfiles) '$(distdir)'
diff --git a/lib/buildsystem/local.mk b/lib/buildsystem/local.mk
new file mode 100644
index 0000000..81679c7
--- /dev/null
+++ b/lib/buildsystem/local.mk
@@ -0,0 +1,23 @@
+# opkhelper
+# lib/buildsystem/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/>.
+
+lib_buildsystem_srcs = \
+	lib/buildsystem/autoconf.sh \
+	lib/buildsystem/kbuild.sh \
+	lib/buildsystem/make.sh
+lib_buildsystem_distfiles = lib/buildsystem/local.mk $(lib_buildsystem_srcs)
diff --git a/lib/local.mk b/lib/local.mk
index a1e80d0..c6043ce 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -16,13 +16,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+include lib/buildsystem/local.mk
+
 lib_srcs = \
 	lib/load.sh \
 	lib/common.sh \
 	lib/buildsystem.sh \
 	$(lib_buildsystem_srcs)
 lib_lib = $(lib_srcs:.sh=.sm)
-lib_distfiles = lib/local.mk $(lib_srcs)
+lib_distfiles = lib/local.mk $(lib_srcs) $(lib_buildsystem_distfiles)
 
 lib_script = \
 	s&@@PACKAGE_NAME@@&$(package_name)&;\