aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2014-07-21 17:46:40 -0700
committerArnold D. Robbins <arnold@skeeve.com>2014-07-21 17:46:40 -0700
commitcd99e34adaad23a24b3333fe45d4267fef3a1eeb (patch)
tree262ec2c9bec56bceec716f4452762533b2db7c49
parenta8fa027b743c00a80b2ca300e3b71b6770fd4866 (diff)
downloadegawk-cd99e34adaad23a24b3333fe45d4267fef3a1eeb.tar.gz
egawk-cd99e34adaad23a24b3333fe45d4267fef3a1eeb.tar.bz2
egawk-cd99e34adaad23a24b3333fe45d4267fef3a1eeb.zip
Bug fix in uninstall in extension directory.
-rw-r--r--extension/ChangeLog8
-rw-r--r--extension/Makefile.am2
-rw-r--r--extension/Makefile.in2
3 files changed, 10 insertions, 2 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog
index f3a1c7a8..ab3d62c0 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-13 Paul Gortmaker <paul.gortmaker@windriver.com>
+
+ * Makefile.am (uninstall-so): Came across below bug while cross
+ compiling, and changed both install-data-hook and uninstall-so
+ to use $(DESTDIR) on v4.1.1 before seeing most of the fix in
+ gawk-4.1.1-3-g976f73ab0356; here we ensure uninstall-so also
+ uses the $(DESTDIR) prefix on its use of pkgextensiondir.
+
2014-04-11 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (install-data-hook): Use $(DESTDIR) when removing
diff --git a/extension/Makefile.am b/extension/Makefile.am
index 11826e2b..b6beaee3 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -105,7 +105,7 @@ install-data-hook:
# Keep the uninstall check working:
uninstall-so:
- $(RM) $(pkgextensiondir)/*.so
+ $(RM) $(DESTDIR)$(pkgextensiondir)/*.so
uninstall-recursive: uninstall-so
diff --git a/extension/Makefile.in b/extension/Makefile.in
index d81b1696..294e4f88 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -1236,7 +1236,7 @@ install-data-hook:
# Keep the uninstall check working:
uninstall-so:
- $(RM) $(pkgextensiondir)/*.so
+ $(RM) $(DESTDIR)$(pkgextensiondir)/*.so
uninstall-recursive: uninstall-so