From 6ef80cf89997127f7dacfb9122ef2a0f6a69a528 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 22 Jul 2017 14:28:01 -0400 Subject: Makefile.am: Drop pkgdatadir and pkgdatacmddir With that, uninstall-hook is no longer needed. --- diff --git a/Makefile.am b/Makefile.am index 6bc6222..75bcadb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,7 +48,6 @@ CLEANFILES = \ $(pro_archman_LDADD) \ $(man1_MANS) \ $(locale_MESSAGES) -pkgdatacmddir = $(pkgdatadir)/cmd EXTRA_DIST = \ COPYING.2 \ COPYING.3 \ @@ -66,8 +65,6 @@ do_subst = sed \ -e 's|@[@]PACKAGE_NAME[@]@|$(PACKAGE)|g' \ -e 's|@[@]PACKAGE_VERSION[@]@|$(PACKAGE_VERSION)|g' \ -e 's|@[@]PACKAGE_DESCRIPTION[@]@|$(PACKAGE_NAME)|g' \ - -e 's|@[@]PKGLIBDIR[@]@|$(pkgdatadir)|g' \ - -e 's|@[@]PKGLIBCMDDIR[@]@|$(pkgdatacmddir)|g' \ -e 's|@[@]LOCALEDIR[@]@|$(localedir)|g' \ -e 's|@[@]SH[@]@|$(SH)|g' \ -e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \ @@ -75,8 +72,6 @@ do_subst = sed \ -e 's|[@]PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ -e 's|[@]SH[@]|$(SH)|g' \ -e 's|[@]bindir[@]|$(bindir)|g' \ - -e 's|[@]pkgdatadir[@]|$(pkgdatadir)|g' \ - -e 's|[@]pkgdatacmddir[@]|$(pkgdatacmddir)|g' \ -e 's|[@]localedir[@]|$(localedir)|g' all-local: $(locale_MESSAGES) @@ -99,15 +94,6 @@ uninstall-local: rm -f "$${dir}/$(TEXTDOMAIN).ms"; \ done -uninstall-hook: - for dir in \ - '$(DESTDIR)$(pkgdatacmddir)' \ - '$(DESTDIR)$(pkgdatadir)'; do \ - if [ -d "$${dir}" ]; then \ - rmdir "$${dir}"; \ - fi; \ - done - really-clean: distclean rm -Rf $(srcdir)/aclocal.m4 $(srcdir)/autom4te.cache/ \ $(srcdir)/configure \ -- cgit v0.9.1