Change lib macros and targets to pkglib ones.

3 files changed, 22 insertions, 20 deletions

diff --git a/Makefile.in b/Makefile.in
index b5a85eb..91b1019 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,7 +53,7 @@ include $(srcdir)/src/local.mk
 include $(srcdir)/lib/local.mk
 
 bin = $(src_bin)
-lib = $(lib_lib)
+pkglib = $(lib_pkglib)
 
 distdir = $(package_name)-$(package_version)
 distfiles = \
@@ -72,23 +72,23 @@ all: all-exec
 	@cd locale && $(MAKE) $(MACROS) all
 	@printf 'Making manual pages...\n'
 	@cd man && $(MAKE) $(MACROS) all
-all-exec: all-bin all-lib
+all-exec: all-bin all-pkglib
 all-bin: $(bin)
-all-lib: $(lib)
+all-pkglib: $(pkglib)
 
 clean: clean-exec
 	@printf 'Cleaning locales...\n'
 	@cd locale && $(MAKE) $(MACROS) clean
 	@printf 'Cleaning manual pages...\n'
 	@cd man && $(MAKE) $(MACROS) clean
-clean-exec: clean-bin clean-lib
+clean-exec: clean-bin clean-pkglib
 clean-bin:
 	@for f in $(bin); do \
 		printf '  RM %s\n' "$${f}"; \
 		rm -f "$${f}"; \
 	done
-clean-lib:
-	@for f in $(lib); do \
+clean-pkglib:
+	@for f in $(pkglib); do \
 		printf '  RM %s\n' "$${f}"; \
 		rm -f "$${f}"; \
 	done
@@ -98,7 +98,7 @@ install: all install-exec
 	@cd locale && $(MAKE) $(MACROS) install
 	@printf 'Installing manual pages...\n'
 	@cd man && $(MAKE) $(MACROS) install
-install-exec: install-bin install-lib
+install-exec: install-bin install-pkglib
 install-bin:
 	@mkdir -p '$(DESTDIR)/$(bindir)'
 	@for f in $(bin); do \
@@ -109,15 +109,15 @@ install-bin:
 		cp "$${f}" "$(DESTDIR)/$(bindir)/$${ff}"; \
 		chmod 755 "$(DESTDIR)/$(bindir)/$${ff}"; \
 	done
-install-lib:
-	@mkdir -p '$(DESTDIR)/$(libdir)'
-	@for f in $(lib); do \
+install-pkglib:
+	@mkdir -p '$(DESTDIR)/$(pkglibdir)'
+	@for f in $(pkglib); do \
 		printf '  INSTALL %s\n' "$${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}"; \
+			mkdir -p "$(DESTDIR)/$(pkglibdir)/$${ff%/?*}"; \
+		cp "$${f}" "$(DESTDIR)/$(pkglibdir)/$${ff}"; \
+		chmod 644 "$(DESTDIR)/$(pkglibdir)/$${ff}"; \
 	done
 
 uninstall: uninstall-exec
@@ -125,18 +125,18 @@ uninstall: uninstall-exec
 	@cd locale && $(MAKE) $(MACROS) uninstall
 	@printf 'Uninstalling manual pages...\n'
 	@cd man && $(MAKE) $(MACROS) uninstall
-uninstall-exec: uninstall-bin uninstall-lib
+uninstall-exec: uninstall-bin uninstall-pkglib
 uninstall-bin:
 	@for f in $(bin); do \
 		printf '  RM %s\n' "$${f}"; \
 		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
 		rm -f "$(DESTDIR)/$(bindir)/$${ff}"; \
 	done
-uninstall-lib:
-	@for f in $(lib); do \
+uninstall-pkglib:
+	@for f in $(pkglib); do \
 		printf '  RM %s\n' "$${f}"; \
 		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
-		rm -f "$(DESTDIR)/$(libdir)/$${ff}"; \
+		rm -f "$(DESTDIR)/$(pkglibdir)/$${ff}"; \
 	done
 
 $(distdir):
diff --git a/lib/local.mk b/lib/local.mk
index c6043ce..cbc5684 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -23,14 +23,15 @@ lib_srcs = \
 	lib/common.sh \
 	lib/buildsystem.sh \
 	$(lib_buildsystem_srcs)
-lib_lib = $(lib_srcs:.sh=.sm)
+lib_pkglib = $(lib_srcs:.sh=.sm)
 lib_distfiles = lib/local.mk $(lib_srcs) $(lib_buildsystem_distfiles)
 
 lib_script = \
 	s&@@PACKAGE_NAME@@&$(package_name)&;\
 	s&@@PACKAGE_VERSION@@&$(package_version)&;\
-	s&@@LOCALEDIR@@&$(localedir)&;\
+	s&@@PKGLIBDIR@@&$(pkglibdir)&;\
 	s&@@LIBOPKHELPER@@&$(libopkhelper)&;\
+	s&@@LOCALEDIR@@&$(localedir)&;\
 	s&@@SH@@&$(sh)&;
 
 .SUFFIXES: .sh .sm
diff --git a/src/local.mk b/src/local.mk
index 60d7fb3..d10aa89 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -32,8 +32,9 @@ src_distfiles = src/local.mk $(src_srcs)
 src_script = \
 	s&@@PACKAGE_NAME@@&$(package_name)&;\
 	s&@@PACKAGE_VERSION@@&$(package_version)&;\
-	s&@@LOCALEDIR@@&$(localedir)&;\
+	s&@@PKGLIBDIR@@&$(pkglibdir)&;\
 	s&@@LIBOPKHELPER@@&$(libopkhelper)&;\
+	s&@@LOCALEDIR@@&$(localedir)&;\
 	s&@@SH@@&$(sh)&;
 
 .SUFFIXES: .sh